* [PATCH 1/7] usb: isp1760: move to regmap for register access
2021-05-04 10:19 [PATCH 0/7] usb: isp1760: extend support for isp1763 Rui Miguel Silva
@ 2021-05-04 10:19 ` Rui Miguel Silva
2021-05-06 12:24 ` Laurent Pinchart
2021-05-04 10:19 ` [PATCH 2/7] usb: isp1760: remove platform data struct and code Rui Miguel Silva
` (6 subsequent siblings)
7 siblings, 1 reply; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-04 10:19 UTC (permalink / raw)
To: Greg Kroah-Hartman, Sebastian Siewior, Laurent Pinchart, Rob Herring
Cc: linux-usb, devicetree, Rui Miguel Silva
Rework access to registers and memory to use regmap framework.
No change in current feature or way of work is intended with this
change.
This will allow to reuse this driver with other IP of this family,
for example isp1763, with little changes and effort.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/usb/isp1760/isp1760-core.c | 123 +++++---
drivers/usb/isp1760/isp1760-core.h | 38 ++-
drivers/usb/isp1760/isp1760-hcd.c | 436 ++++++++++++++--------------
drivers/usb/isp1760/isp1760-hcd.h | 18 +-
drivers/usb/isp1760/isp1760-if.c | 4 +-
drivers/usb/isp1760/isp1760-regs.h | 442 +++++++++++++++++------------
drivers/usb/isp1760/isp1760-udc.c | 235 +++++++++------
drivers/usb/isp1760/isp1760-udc.h | 10 +-
8 files changed, 779 insertions(+), 527 deletions(-)
diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
index fdeb4cf97cc5..f78e637d3b9a 100644
--- a/drivers/usb/isp1760/isp1760-core.c
+++ b/drivers/usb/isp1760/isp1760-core.c
@@ -25,8 +25,8 @@
static void isp1760_init_core(struct isp1760_device *isp)
{
- u32 otgctrl;
- u32 hwmode;
+ struct isp1760_hcd *hcd = &isp->hcd;
+ struct isp1760_udc *udc = &isp->udc;
/* Low-level chip reset */
if (isp->rst_gpio) {
@@ -39,24 +39,22 @@ static void isp1760_init_core(struct isp1760_device *isp)
* Reset the host controller, including the CPU interface
* configuration.
*/
- isp1760_write32(isp->regs, HC_RESET_REG, SW_RESET_RESET_ALL);
+ isp1760_field_set(hcd->fields, SW_RESET_RESET_ALL);
msleep(100);
/* Setup HW Mode Control: This assumes a level active-low interrupt */
- hwmode = HW_DATA_BUS_32BIT;
-
if (isp->devflags & ISP1760_FLAG_BUS_WIDTH_16)
- hwmode &= ~HW_DATA_BUS_32BIT;
+ isp1760_field_clear(hcd->fields, HW_DATA_BUS_WIDTH);
if (isp->devflags & ISP1760_FLAG_ANALOG_OC)
- hwmode |= HW_ANA_DIGI_OC;
+ isp1760_field_set(hcd->fields, HW_ANA_DIGI_OC);
if (isp->devflags & ISP1760_FLAG_DACK_POL_HIGH)
- hwmode |= HW_DACK_POL_HIGH;
+ isp1760_field_set(hcd->fields, HW_DACK_POL_HIGH);
if (isp->devflags & ISP1760_FLAG_DREQ_POL_HIGH)
- hwmode |= HW_DREQ_POL_HIGH;
+ isp1760_field_set(hcd->fields, HW_DREQ_POL_HIGH);
if (isp->devflags & ISP1760_FLAG_INTR_POL_HIGH)
- hwmode |= HW_INTR_HIGH_ACT;
+ isp1760_field_set(hcd->fields, HW_INTR_HIGH_ACT);
if (isp->devflags & ISP1760_FLAG_INTR_EDGE_TRIG)
- hwmode |= HW_INTR_EDGE_TRIG;
+ isp1760_field_set(hcd->fields, HW_INTR_EDGE_TRIG);
/*
* The ISP1761 has a dedicated DC IRQ line but supports sharing the HC
@@ -65,18 +63,10 @@ static void isp1760_init_core(struct isp1760_device *isp)
* spurious interrupts during HCD registration.
*/
if (isp->devflags & ISP1760_FLAG_ISP1761) {
- isp1760_write32(isp->regs, DC_MODE, 0);
- hwmode |= HW_COMN_IRQ;
+ isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
+ isp1760_field_set(hcd->fields, HW_COMN_IRQ);
}
- /*
- * We have to set this first in case we're in 16-bit mode.
- * Write it twice to ensure correct upper bits if switching
- * to 16-bit mode.
- */
- isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
- isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
-
/*
* PORT 1 Control register of the ISP1760 is the OTG control register
* on ISP1761.
@@ -85,14 +75,15 @@ static void isp1760_init_core(struct isp1760_device *isp)
* when OTG is requested.
*/
if ((isp->devflags & ISP1760_FLAG_ISP1761) &&
- (isp->devflags & ISP1760_FLAG_OTG_EN))
- otgctrl = ((HW_DM_PULLDOWN | HW_DP_PULLDOWN) << 16)
- | HW_OTG_DISABLE;
- else
- otgctrl = (HW_SW_SEL_HC_DC << 16)
- | (HW_VBUS_DRV | HW_SEL_CP_EXT);
-
- isp1760_write32(isp->regs, HC_PORT1_CTRL, otgctrl);
+ (isp->devflags & ISP1760_FLAG_OTG_EN)) {
+ isp1760_field_set(hcd->fields, HW_DM_PULLDOWN);
+ isp1760_field_set(hcd->fields, HW_DP_PULLDOWN);
+ isp1760_field_set(hcd->fields, HW_OTG_DISABLE);
+ } else {
+ isp1760_field_set(hcd->fields, HW_SW_SEL_HC_DC);
+ isp1760_field_set(hcd->fields, HW_VBUS_DRV);
+ isp1760_field_set(hcd->fields, HW_SEL_CP_EXT);
+ }
dev_info(isp->dev, "bus width: %u, oc: %s\n",
isp->devflags & ISP1760_FLAG_BUS_WIDTH_16 ? 16 : 32,
@@ -101,16 +92,43 @@ static void isp1760_init_core(struct isp1760_device *isp)
void isp1760_set_pullup(struct isp1760_device *isp, bool enable)
{
- isp1760_write32(isp->regs, HW_OTG_CTRL_SET,
- enable ? HW_DP_PULLUP : HW_DP_PULLUP << 16);
+ struct isp1760_udc *udc = &isp->udc;
+
+ if (enable)
+ isp1760_field_set(udc->fields, HW_DP_PULLUP);
+ else
+ isp1760_field_set(udc->fields, HW_DP_PULLUP_CLEAR);
}
+static struct regmap_config isp1760_hc_regmap_conf = {
+ .name = "isp1760-hc",
+ .reg_bits = 16,
+ .val_bits = 32,
+ .fast_io = true,
+ .max_register = ISP176x_HC_MEMORY,
+ .volatile_table = &isp176x_hc_volatile_table,
+};
+
+static struct regmap_config isp1761_dc_regmap_conf = {
+ .name = "isp1761-dc",
+ .reg_bits = 16,
+ .val_bits = 32,
+ .fast_io = true,
+ .max_register = ISP1761_DC_OTG_CTRL_CLEAR,
+ .volatile_table = &isp176x_dc_volatile_table,
+};
+
int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
struct device *dev, unsigned int devflags)
{
struct isp1760_device *isp;
+ struct isp1760_hcd *hcd;
+ struct isp1760_udc *udc;
bool udc_disabled = !(devflags & ISP1760_FLAG_ISP1761);
+ struct regmap_field *f;
+ void __iomem *base;
int ret;
+ int i;
/*
* If neither the HCD not the UDC is enabled return an error, as no
@@ -126,19 +144,52 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
isp->dev = dev;
isp->devflags = devflags;
+ hcd = &isp->hcd;
+ udc = &isp->udc;
+
+ if (devflags & ISP1760_FLAG_BUS_WIDTH_16) {
+ isp1760_hc_regmap_conf.val_bits = 16;
+ isp1761_dc_regmap_conf.val_bits = 16;
+ }
isp->rst_gpio = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);
if (IS_ERR(isp->rst_gpio))
return PTR_ERR(isp->rst_gpio);
- isp->regs = devm_ioremap_resource(dev, mem);
- if (IS_ERR(isp->regs))
- return PTR_ERR(isp->regs);
+ hcd->base = devm_ioremap_resource(dev, mem);
+ if (IS_ERR(hcd->base))
+ return PTR_ERR(hcd->base);
+
+ hcd->regs = devm_regmap_init_mmio(dev, base, &isp1760_hc_regmap_conf);
+ if (IS_ERR(hcd->regs))
+ return PTR_ERR(hcd->regs);
+
+ for (i = 0; i < HC_FIELD_MAX; i++) {
+ f = devm_regmap_field_alloc(dev, hcd->regs,
+ isp1760_hc_reg_fields[i]);
+ if (IS_ERR(f))
+ return PTR_ERR(f);
+
+ hcd->fields[i] = f;
+ }
+
+ udc->regs = devm_regmap_init_mmio(dev, base, &isp1761_dc_regmap_conf);
+ if (IS_ERR(udc->regs))
+ return PTR_ERR(udc->regs);
+
+ for (i = 0; i < DC_FIELD_MAX; i++) {
+ f = devm_regmap_field_alloc(dev, udc->regs,
+ isp1761_dc_reg_fields[i]);
+ if (IS_ERR(f))
+ return PTR_ERR(f);
+
+ udc->fields[i] = f;
+ }
isp1760_init_core(isp);
if (IS_ENABLED(CONFIG_USB_ISP1760_HCD) && !usb_disabled()) {
- ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq,
+ ret = isp1760_hcd_register(hcd, mem, irq,
irqflags | IRQF_SHARED, dev);
if (ret < 0)
return ret;
@@ -147,7 +198,7 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
if (IS_ENABLED(CONFIG_USB_ISP1761_UDC) && !udc_disabled) {
ret = isp1760_udc_register(isp, irq, irqflags);
if (ret < 0) {
- isp1760_hcd_unregister(&isp->hcd);
+ isp1760_hcd_unregister(hcd);
return ret;
}
}
diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
index d9a0a4cc467c..8fec6395f19f 100644
--- a/drivers/usb/isp1760/isp1760-core.h
+++ b/drivers/usb/isp1760/isp1760-core.h
@@ -14,6 +14,7 @@
#define _ISP1760_CORE_H_
#include <linux/ioport.h>
+#include <linux/regmap.h>
#include "isp1760-hcd.h"
#include "isp1760-udc.h"
@@ -38,7 +39,6 @@ struct gpio_desc;
struct isp1760_device {
struct device *dev;
- void __iomem *regs;
unsigned int devflags;
struct gpio_desc *rst_gpio;
@@ -52,14 +52,42 @@ void isp1760_unregister(struct device *dev);
void isp1760_set_pullup(struct isp1760_device *isp, bool enable);
-static inline u32 isp1760_read32(void __iomem *base, u32 reg)
+static inline u32 isp1760_field_read(struct regmap_field **fields, u32 field)
{
- return readl(base + reg);
+ unsigned int val;
+
+ regmap_field_read(fields[field], &val);
+
+ return val;
+}
+
+static inline void isp1760_field_write(struct regmap_field **fields, u32 field,
+ u32 val)
+{
+ regmap_field_write(fields[field], val);
+}
+
+static inline void isp1760_field_set(struct regmap_field **fields, u32 field)
+{
+ isp1760_field_write(fields, field, 0xFFFFFFFF);
}
-static inline void isp1760_write32(void __iomem *base, u32 reg, u32 val)
+static inline void isp1760_field_clear(struct regmap_field **fields, u32 field)
{
- writel(val, base + reg);
+ isp1760_field_write(fields, field, 0);
}
+static inline u32 isp1760_reg_read(struct regmap *regs, u32 reg)
+{
+ unsigned int val;
+
+ regmap_read(regs, reg, &val);
+
+ return val;
+}
+
+static inline void isp1760_reg_write(struct regmap *regs, u32 reg, u32 val)
+{
+ regmap_write(regs, reg, val);
+}
#endif
diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
index 33ae656c4b68..0601b1a4bd42 100644
--- a/drivers/usb/isp1760/isp1760-hcd.c
+++ b/drivers/usb/isp1760/isp1760-hcd.c
@@ -66,6 +66,10 @@ struct ptd {
#define ATL_PTD_OFFSET 0x0c00
#define PAYLOAD_OFFSET 0x1000
+#define ISP_BANK_0 0x00
+#define ISP_BANK_1 0x01
+#define ISP_BANK_2 0x02
+#define ISP_BANK_3 0x03
/* ATL */
/* DW0 */
@@ -159,16 +163,59 @@ struct urb_listitem {
};
/*
- * Access functions for isp176x registers (addresses 0..0x03FF).
+ * Access functions for isp176x registers regmap fields
*/
-static u32 reg_read32(void __iomem *base, u32 reg)
+static u32 isp1760_hcd_read(struct usb_hcd *hcd, u32 field)
{
- return isp1760_read32(base, reg);
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
+ return isp1760_field_read(priv->fields, field);
+}
+
+static void isp1760_hcd_write(struct usb_hcd *hcd, u32 field, u32 val)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
+ isp1760_field_write(priv->fields, field, val);
+}
+
+static void isp1760_hcd_set(struct usb_hcd *hcd, u32 field)
+{
+ isp1760_hcd_write(hcd, field, 0xFFFFFFFF);
+}
+
+static void isp1760_hcd_clear(struct usb_hcd *hcd, u32 field)
+{
+ isp1760_hcd_write(hcd, field, 0);
+}
+
+static int isp1760_hcd_set_poll_timeout(struct usb_hcd *hcd, u32 field,
+ u32 timeout_us)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ unsigned int val;
+
+ isp1760_hcd_set(hcd, field);
+
+ return regmap_field_read_poll_timeout(priv->fields[field], val, 1, 1,
+ timeout_us);
}
-static void reg_write32(void __iomem *base, u32 reg, u32 val)
+static int isp1760_hcd_clear_poll_timeout(struct usb_hcd *hcd, u32 field,
+ u32 timeout_us)
{
- isp1760_write32(base, reg, val);
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ unsigned int val;
+
+ isp1760_hcd_clear(hcd, field);
+
+ return regmap_field_read_poll_timeout(priv->fields[field], val, 0, 1,
+ timeout_us);
+}
+
+static bool isp1760_hcd_is_set(struct usb_hcd *hcd, u32 field)
+{
+ return !!isp1760_hcd_read(hcd, field);
}
/*
@@ -231,12 +278,15 @@ static void bank_reads8(void __iomem *src_base, u32 src_offset, u32 bank_addr,
}
}
-static void mem_reads8(void __iomem *src_base, u32 src_offset, void *dst,
- u32 bytes)
+static void mem_reads8(struct usb_hcd *hcd, void __iomem *src_base,
+ u32 src_offset, void *dst, u32 bytes)
{
- reg_write32(src_base, HC_MEMORY_REG, src_offset + ISP_BANK(0));
+ isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
+ isp1760_hcd_write(hcd, MEM_START_ADDR, src_offset);
+
ndelay(90);
- bank_reads8(src_base, src_offset, ISP_BANK(0), dst, bytes);
+
+ bank_reads8(src_base, src_offset, ISP_BANK_0, dst, bytes);
}
static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
@@ -278,14 +328,15 @@ static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
* Read and write ptds. 'ptd_offset' should be one of ISO_PTD_OFFSET,
* INT_PTD_OFFSET, and ATL_PTD_OFFSET. 'slot' should be less than 32.
*/
-static void ptd_read(void __iomem *base, u32 ptd_offset, u32 slot,
- struct ptd *ptd)
+static void ptd_read(struct usb_hcd *hcd, void __iomem *base,
+ u32 ptd_offset, u32 slot, struct ptd *ptd)
{
- reg_write32(base, HC_MEMORY_REG,
- ISP_BANK(0) + ptd_offset + slot*sizeof(*ptd));
+ isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
+ isp1760_hcd_write(hcd, MEM_START_ADDR,
+ ptd_offset + slot * sizeof(*ptd));
ndelay(90);
- bank_reads8(base, ptd_offset + slot*sizeof(*ptd), ISP_BANK(0),
- (void *) ptd, sizeof(*ptd));
+ bank_reads8(base, ptd_offset + slot * sizeof(*ptd), ISP_BANK_0,
+ (void *)ptd, sizeof(*ptd));
}
static void ptd_write(void __iomem *base, u32 ptd_offset, u32 slot,
@@ -377,34 +428,15 @@ static void free_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
qtd->payload_addr = 0;
}
-static int handshake(struct usb_hcd *hcd, u32 reg,
- u32 mask, u32 done, int usec)
-{
- u32 result;
- int ret;
-
- ret = readl_poll_timeout_atomic(hcd->regs + reg, result,
- ((result & mask) == done ||
- result == U32_MAX), 1, usec);
- if (result == U32_MAX)
- return -ENODEV;
-
- return ret;
-}
-
/* reset a non-running (STS_HALT == 1) controller */
static int ehci_reset(struct usb_hcd *hcd)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
- u32 command = reg_read32(hcd->regs, HC_USBCMD);
-
- command |= CMD_RESET;
- reg_write32(hcd->regs, HC_USBCMD, command);
hcd->state = HC_STATE_HALT;
priv->next_statechange = jiffies;
- return handshake(hcd, HC_USBCMD, CMD_RESET, 0, 250 * 1000);
+ return isp1760_hcd_set_poll_timeout(hcd, CMD_RESET, 250 * 1000);
}
static struct isp1760_qh *qh_alloc(gfp_t flags)
@@ -432,8 +464,10 @@ static void qh_free(struct isp1760_qh *qh)
/* one-time init, only for memory state */
static int priv_init(struct usb_hcd *hcd)
{
- struct isp1760_hcd *priv = hcd_to_priv(hcd);
- u32 hcc_params;
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ u32 isoc_cache;
+ u32 isoc_thres;
+
int i;
spin_lock_init(&priv->lock);
@@ -448,12 +482,14 @@ static int priv_init(struct usb_hcd *hcd)
priv->periodic_size = DEFAULT_I_TDPS;
/* controllers may cache some of the periodic schedule ... */
- hcc_params = reg_read32(hcd->regs, HC_HCCPARAMS);
+ isoc_cache = isp1760_hcd_read(hcd->regs, HCC_ISOC_CACHE);
+ isoc_thres = isp1760_hcd_read(hcd->regs, HCC_ISOC_THRES);
+
/* full frame cache */
- if (HCC_ISOC_CACHE(hcc_params))
+ if (isoc_cache)
priv->i_thresh = 8;
else /* N microframes cached */
- priv->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
+ priv->i_thresh = 2 + isoc_thres;
return 0;
}
@@ -462,12 +498,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
int result;
- u32 scratch, hwmode;
+ u32 scratch;
+
+ isp1760_reg_write(priv->regs, ISP176x_HC_SCRATCH, 0xdeadbabe);
- reg_write32(hcd->regs, HC_SCRATCH_REG, 0xdeadbabe);
/* Change bus pattern */
- scratch = reg_read32(hcd->regs, HC_CHIP_ID_REG);
- scratch = reg_read32(hcd->regs, HC_SCRATCH_REG);
+ scratch = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
+ scratch = isp1760_reg_read(priv->regs, ISP176x_HC_SCRATCH);
if (scratch != 0xdeadbabe) {
dev_err(hcd->self.controller, "Scratch test failed.\n");
return -ENODEV;
@@ -481,10 +518,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
* the host controller through the EHCI USB Command register. The device
* has been reset in core code anyway, so this shouldn't matter.
*/
- reg_write32(hcd->regs, HC_BUFFER_STATUS_REG, 0);
- reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
- reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
- reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
+ isp1760_reg_write(priv->regs, ISP176x_HC_BUFFER_STATUS, 0);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
+ NO_TRANSFER_ACTIVE);
+ isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
+ NO_TRANSFER_ACTIVE);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP,
+ NO_TRANSFER_ACTIVE);
result = ehci_reset(hcd);
if (result)
@@ -493,14 +533,11 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
/* Step 11 passed */
/* ATL reset */
- hwmode = reg_read32(hcd->regs, HC_HW_MODE_CTRL) & ~ALL_ATX_RESET;
- reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode | ALL_ATX_RESET);
+ isp1760_hcd_set(hcd, ALL_ATX_RESET);
mdelay(10);
- reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode);
-
- reg_write32(hcd->regs, HC_INTERRUPT_ENABLE, INTERRUPT_ENABLE_MASK);
+ isp1760_hcd_clear(hcd, ALL_ATX_RESET);
- priv->hcs_params = reg_read32(hcd->regs, HC_HCSPARAMS);
+ isp1760_hcd_set(hcd, HC_INT_ENABLE);
return priv_init(hcd);
}
@@ -730,12 +767,12 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
/* Make sure done map has not triggered from some unlinked transfer */
if (ptd_offset == ATL_PTD_OFFSET) {
- priv->atl_done_map |= reg_read32(hcd->regs,
- HC_ATL_PTD_DONEMAP_REG);
+ priv->atl_done_map |= isp1760_reg_read(priv->regs,
+ ISP176x_HC_ATL_PTD_DONEMAP);
priv->atl_done_map &= ~(1 << slot);
} else {
- priv->int_done_map |= reg_read32(hcd->regs,
- HC_INT_PTD_DONEMAP_REG);
+ priv->int_done_map |= isp1760_reg_read(priv->regs,
+ ISP176x_HC_INT_PTD_DONEMAP);
priv->int_done_map &= ~(1 << slot);
}
@@ -744,16 +781,20 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
slots[slot].timestamp = jiffies;
slots[slot].qtd = qtd;
slots[slot].qh = qh;
- ptd_write(hcd->regs, ptd_offset, slot, ptd);
+ ptd_write(priv->base, ptd_offset, slot, ptd);
if (ptd_offset == ATL_PTD_OFFSET) {
- skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
+ skip_map = isp1760_reg_read(priv->regs,
+ ISP176x_HC_ATL_PTD_SKIPMAP);
skip_map &= ~(1 << qh->slot);
- reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
+ skip_map);
} else {
- skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
+ skip_map = isp1760_reg_read(priv->regs,
+ ISP176x_HC_INT_PTD_SKIPMAP);
skip_map &= ~(1 << qh->slot);
- reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
+ isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
+ skip_map);
}
}
@@ -766,9 +807,10 @@ static int is_short_bulk(struct isp1760_qtd *qtd)
static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
struct list_head *urb_list)
{
- int last_qtd;
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
struct isp1760_qtd *qtd, *qtd_next;
struct urb_listitem *urb_listitem;
+ int last_qtd;
list_for_each_entry_safe(qtd, qtd_next, &qh->qtd_list, qtd_list) {
if (qtd->status < QTD_XFER_COMPLETE)
@@ -783,9 +825,10 @@ static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
if (qtd->actual_length) {
switch (qtd->packet_type) {
case IN_PID:
- mem_reads8(hcd->regs, qtd->payload_addr,
- qtd->data_buffer,
- qtd->actual_length);
+ mem_reads8(hcd, priv->base,
+ qtd->payload_addr,
+ qtd->data_buffer,
+ qtd->actual_length);
fallthrough;
case OUT_PID:
qtd->urb->actual_length +=
@@ -873,8 +916,8 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
if ((qtd->length) &&
((qtd->packet_type == SETUP_PID) ||
(qtd->packet_type == OUT_PID))) {
- mem_writes8(hcd->regs, qtd->payload_addr,
- qtd->data_buffer, qtd->length);
+ mem_writes8(priv->base, qtd->payload_addr,
+ qtd->data_buffer, qtd->length);
}
qtd->status = QTD_PAYLOAD_ALLOC;
@@ -1074,9 +1117,9 @@ static void handle_done_ptds(struct usb_hcd *hcd)
int modified;
int skip_map;
- skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
+ skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP);
priv->int_done_map &= ~skip_map;
- skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
+ skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP);
priv->atl_done_map &= ~skip_map;
modified = priv->int_done_map || priv->atl_done_map;
@@ -1094,7 +1137,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
continue;
}
ptd_offset = INT_PTD_OFFSET;
- ptd_read(hcd->regs, INT_PTD_OFFSET, slot, &ptd);
+ ptd_read(hcd, priv->base, INT_PTD_OFFSET, slot, &ptd);
state = check_int_transfer(hcd, &ptd,
slots[slot].qtd->urb);
} else {
@@ -1109,7 +1152,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
continue;
}
ptd_offset = ATL_PTD_OFFSET;
- ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
+ ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
state = check_atl_transfer(hcd, &ptd,
slots[slot].qtd->urb);
}
@@ -1134,7 +1177,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
qtd->status = QTD_XFER_COMPLETE;
if (list_is_last(&qtd->qtd_list, &qh->qtd_list) ||
- is_short_bulk(qtd))
+ is_short_bulk(qtd))
qtd = NULL;
else
qtd = list_entry(qtd->qtd_list.next,
@@ -1210,13 +1253,15 @@ static irqreturn_t isp1760_irq(struct usb_hcd *hcd)
if (!(hcd->state & HC_STATE_RUNNING))
goto leave;
- imask = reg_read32(hcd->regs, HC_INTERRUPT_REG);
+ imask = isp1760_reg_read(priv->regs, ISP176x_HC_INTERRUPT);
if (unlikely(!imask))
goto leave;
- reg_write32(hcd->regs, HC_INTERRUPT_REG, imask); /* Clear */
+ isp1760_reg_write(priv->regs, ISP176x_HC_INTERRUPT, imask); /* Clear */
- priv->int_done_map |= reg_read32(hcd->regs, HC_INT_PTD_DONEMAP_REG);
- priv->atl_done_map |= reg_read32(hcd->regs, HC_ATL_PTD_DONEMAP_REG);
+ priv->int_done_map |= isp1760_reg_read(priv->regs,
+ ISP176x_HC_INT_PTD_DONEMAP);
+ priv->atl_done_map |= isp1760_reg_read(priv->regs,
+ ISP176x_HC_ATL_PTD_DONEMAP);
handle_done_ptds(hcd);
@@ -1271,7 +1316,7 @@ static void errata2_function(struct timer_list *unused)
if (priv->atl_slots[slot].qh && time_after(jiffies,
priv->atl_slots[slot].timestamp +
msecs_to_jiffies(SLOT_TIMEOUT))) {
- ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
+ ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
if (!FROM_DW0_VALID(ptd.dw0) &&
!FROM_DW3_ACTIVE(ptd.dw3))
priv->atl_done_map |= 1 << slot;
@@ -1288,9 +1333,8 @@ static void errata2_function(struct timer_list *unused)
static int isp1760_run(struct usb_hcd *hcd)
{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
int retval;
- u32 temp;
- u32 command;
u32 chipid;
hcd->uses_new_polling = 1;
@@ -1298,23 +1342,20 @@ static int isp1760_run(struct usb_hcd *hcd)
hcd->state = HC_STATE_RUNNING;
/* Set PTD interrupt AND & OR maps */
- reg_write32(hcd->regs, HC_ATL_IRQ_MASK_AND_REG, 0);
- reg_write32(hcd->regs, HC_ATL_IRQ_MASK_OR_REG, 0xffffffff);
- reg_write32(hcd->regs, HC_INT_IRQ_MASK_AND_REG, 0);
- reg_write32(hcd->regs, HC_INT_IRQ_MASK_OR_REG, 0xffffffff);
- reg_write32(hcd->regs, HC_ISO_IRQ_MASK_AND_REG, 0);
- reg_write32(hcd->regs, HC_ISO_IRQ_MASK_OR_REG, 0xffffffff);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_AND, 0);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_OR, 0xffffffff);
+ isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_AND, 0);
+ isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_OR, 0xffffffff);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_AND, 0);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_OR, 0xffffffff);
/* step 23 passed */
- temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
- reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp | HW_GLOBAL_INTR_EN);
+ isp1760_hcd_set(hcd, HW_GLOBAL_INTR_EN);
- command = reg_read32(hcd->regs, HC_USBCMD);
- command &= ~(CMD_LRESET|CMD_RESET);
- command |= CMD_RUN;
- reg_write32(hcd->regs, HC_USBCMD, command);
+ isp1760_hcd_clear(hcd, CMD_LRESET);
+ isp1760_hcd_clear(hcd, CMD_RESET);
- retval = handshake(hcd, HC_USBCMD, CMD_RUN, CMD_RUN, 250 * 1000);
+ retval = isp1760_hcd_set_poll_timeout(hcd, CMD_RUN, 250 * 1000);
if (retval)
return retval;
@@ -1324,9 +1365,8 @@ static int isp1760_run(struct usb_hcd *hcd)
* the semaphore while doing so.
*/
down_write(&ehci_cf_port_reset_rwsem);
- reg_write32(hcd->regs, HC_CONFIGFLAG, FLAG_CF);
- retval = handshake(hcd, HC_CONFIGFLAG, FLAG_CF, FLAG_CF, 250 * 1000);
+ retval = isp1760_hcd_set_poll_timeout(hcd, FLAG_CF, 250 * 1000);
up_write(&ehci_cf_port_reset_rwsem);
if (retval)
return retval;
@@ -1336,21 +1376,22 @@ static int isp1760_run(struct usb_hcd *hcd)
errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
add_timer(&errata2_timer);
- chipid = reg_read32(hcd->regs, HC_CHIP_ID_REG);
+ chipid = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
dev_info(hcd->self.controller, "USB ISP %04x HW rev. %d started\n",
chipid & 0xffff, chipid >> 16);
/* PTD Register Init Part 2, Step 28 */
/* Setup registers controlling PTD checking */
- reg_write32(hcd->regs, HC_ATL_PTD_LASTPTD_REG, 0x80000000);
- reg_write32(hcd->regs, HC_INT_PTD_LASTPTD_REG, 0x80000000);
- reg_write32(hcd->regs, HC_ISO_PTD_LASTPTD_REG, 0x00000001);
- reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, 0xffffffff);
- reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, 0xffffffff);
- reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, 0xffffffff);
- reg_write32(hcd->regs, HC_BUFFER_STATUS_REG,
- ATL_BUF_FILL | INT_BUF_FILL);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_LASTPTD, 0x80000000);
+ isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_LASTPTD, 0x80000000);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_LASTPTD, 0x00000001);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP, 0xffffffff);
+ isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP, 0xffffffff);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP, 0xffffffff);
+
+ isp1760_hcd_set(hcd, ATL_BUF_FILL);
+ isp1760_hcd_set(hcd, INT_BUF_FILL);
/* GRR this is run-once init(), being done every time the HC starts.
* So long as they're part of class devices, we can't do it init()
@@ -1584,15 +1625,19 @@ static void kill_transfer(struct usb_hcd *hcd, struct urb *urb,
/* We need to forcefully reclaim the slot since some transfers never
return, e.g. interrupt transfers and NAKed bulk transfers. */
if (usb_pipecontrol(urb->pipe) || usb_pipebulk(urb->pipe)) {
- skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
+ skip_map = isp1760_reg_read(priv->regs,
+ ISP176x_HC_ATL_PTD_SKIPMAP);
skip_map |= (1 << qh->slot);
- reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
+ isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
+ skip_map);
priv->atl_slots[qh->slot].qh = NULL;
priv->atl_slots[qh->slot].qtd = NULL;
} else {
- skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
+ skip_map = isp1760_reg_read(priv->regs,
+ ISP176x_HC_INT_PTD_SKIPMAP);
skip_map |= (1 << qh->slot);
- reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
+ isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
+ skip_map);
priv->int_slots[qh->slot].qh = NULL;
priv->int_slots[qh->slot].qtd = NULL;
}
@@ -1705,8 +1750,7 @@ static void isp1760_endpoint_disable(struct usb_hcd *hcd,
static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
- u32 temp, status = 0;
- u32 mask;
+ u32 status = 0;
int retval = 1;
unsigned long flags;
@@ -1716,17 +1760,13 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
/* init status to no-changes */
buf[0] = 0;
- mask = PORT_CSC;
spin_lock_irqsave(&priv->lock, flags);
- temp = reg_read32(hcd->regs, HC_PORTSC1);
- if (temp & PORT_OWNER) {
- if (temp & PORT_CSC) {
- temp &= ~PORT_CSC;
- reg_write32(hcd->regs, HC_PORTSC1, temp);
- goto done;
- }
+ if (isp1760_hcd_is_set(hcd, PORT_OWNER) &&
+ isp1760_hcd_is_set(hcd, PORT_CSC)) {
+ isp1760_hcd_clear(hcd, PORT_CSC);
+ goto done;
}
/*
@@ -1735,11 +1775,9 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
* high-speed device is switched over to the companion
* controller by the user.
*/
-
- if ((temp & mask) != 0
- || ((temp & PORT_RESUME) != 0
- && time_after_eq(jiffies,
- priv->reset_done))) {
+ if (isp1760_hcd_is_set(hcd, PORT_CSC) ||
+ (isp1760_hcd_is_set(hcd, PORT_RESUME) &&
+ time_after_eq(jiffies, priv->reset_done))) {
buf [0] |= 1 << (0 + 1);
status = STS_PCD;
}
@@ -1752,9 +1790,11 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
struct usb_hub_descriptor *desc)
{
- int ports = HCS_N_PORTS(priv->hcs_params);
+ int ports;
u16 temp;
+ ports = isp1760_hcd_read(priv->hcd, HCS_N_PORTS);
+
desc->bDescriptorType = USB_DT_HUB;
/* priv 1.0, 2.3.9 says 20ms max */
desc->bPwrOn2PwrGood = 10;
@@ -1770,7 +1810,7 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
/* per-port overcurrent reporting */
temp = HUB_CHAR_INDV_PORT_OCPM;
- if (HCS_PPC(priv->hcs_params))
+ if (isp1760_hcd_is_set(priv->hcd, HCS_PPC))
/* per-port power control */
temp |= HUB_CHAR_INDV_PORT_LPSM;
else
@@ -1781,38 +1821,37 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
#define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)
-static int check_reset_complete(struct usb_hcd *hcd, int index,
- int port_status)
+static void check_reset_complete(struct usb_hcd *hcd, int index)
{
- if (!(port_status & PORT_CONNECT))
- return port_status;
+ if (!(isp1760_hcd_is_set(hcd, PORT_CONNECT)))
+ return;
/* if reset finished and it's still not enabled -- handoff */
- if (!(port_status & PORT_PE)) {
-
+ if (!isp1760_hcd_is_set(hcd, PORT_PE)) {
dev_info(hcd->self.controller,
"port %d full speed --> companion\n",
index + 1);
- port_status |= PORT_OWNER;
- port_status &= ~PORT_RWC_BITS;
- reg_write32(hcd->regs, HC_PORTSC1, port_status);
+ isp1760_hcd_set(hcd, PORT_OWNER);
+ isp1760_hcd_clear(hcd, PORT_CSC);
} else
dev_info(hcd->self.controller, "port %d high speed\n",
index + 1);
- return port_status;
+ return;
}
static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
u16 wValue, u16 wIndex, char *buf, u16 wLength)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
- int ports = HCS_N_PORTS(priv->hcs_params);
- u32 temp, status;
+ u32 status;
unsigned long flags;
int retval = 0;
+ int ports;
+
+ ports = isp1760_hcd_read(hcd, HCS_N_PORTS);
/*
* FIXME: support SetPortFeatures USB_PORT_FEAT_INDICATOR.
@@ -1837,7 +1876,6 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
if (!wIndex || wIndex > ports)
goto error;
wIndex--;
- temp = reg_read32(hcd->regs, HC_PORTSC1);
/*
* Even if OWNER is set, so the port is owned by the
@@ -1848,22 +1886,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
switch (wValue) {
case USB_PORT_FEAT_ENABLE:
- reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_PE);
+ isp1760_hcd_clear(hcd, PORT_PE);
break;
case USB_PORT_FEAT_C_ENABLE:
/* XXX error? */
break;
case USB_PORT_FEAT_SUSPEND:
- if (temp & PORT_RESET)
+ if (isp1760_hcd_is_set(hcd, PORT_RESET))
goto error;
- if (temp & PORT_SUSPEND) {
- if ((temp & PORT_PE) == 0)
+ if (isp1760_hcd_is_set(hcd, PORT_SUSPEND)) {
+ if (!isp1760_hcd_is_set(hcd, PORT_PE))
goto error;
/* resume signaling for 20 msec */
- temp &= ~(PORT_RWC_BITS);
- reg_write32(hcd->regs, HC_PORTSC1,
- temp | PORT_RESUME);
+ isp1760_hcd_clear(hcd, PORT_CSC);
+ isp1760_hcd_set(hcd, PORT_RESUME);
+
priv->reset_done = jiffies +
msecs_to_jiffies(USB_RESUME_TIMEOUT);
}
@@ -1872,12 +1910,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
/* we auto-clear this feature */
break;
case USB_PORT_FEAT_POWER:
- if (HCS_PPC(priv->hcs_params))
- reg_write32(hcd->regs, HC_PORTSC1,
- temp & ~PORT_POWER);
+ if (isp1760_hcd_is_set(hcd, HCS_PPC))
+ isp1760_hcd_clear(hcd, PORT_POWER);
break;
case USB_PORT_FEAT_C_CONNECTION:
- reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_CSC);
+ isp1760_hcd_set(hcd, PORT_CSC);
break;
case USB_PORT_FEAT_C_OVER_CURRENT:
/* XXX error ?*/
@@ -1888,7 +1925,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
default:
goto error;
}
- reg_read32(hcd->regs, HC_USBCMD);
+ isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
break;
case GetHubDescriptor:
isp1760_hub_descriptor(priv, (struct usb_hub_descriptor *)
@@ -1903,15 +1940,14 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
goto error;
wIndex--;
status = 0;
- temp = reg_read32(hcd->regs, HC_PORTSC1);
/* wPortChange bits */
- if (temp & PORT_CSC)
+ if (isp1760_hcd_is_set(hcd, PORT_CSC))
status |= USB_PORT_STAT_C_CONNECTION << 16;
/* whoever resumes must GetPortStatus to complete it!! */
- if (temp & PORT_RESUME) {
+ if (isp1760_hcd_is_set(hcd, PORT_RESUME)) {
dev_err(hcd->self.controller, "Port resume should be skipped.\n");
/* Remote Wakeup received? */
@@ -1930,35 +1966,31 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
priv->reset_done = 0;
/* stop resume signaling */
- temp = reg_read32(hcd->regs, HC_PORTSC1);
- reg_write32(hcd->regs, HC_PORTSC1,
- temp & ~(PORT_RWC_BITS | PORT_RESUME));
- retval = handshake(hcd, HC_PORTSC1,
- PORT_RESUME, 0, 2000 /* 2msec */);
+ isp1760_hcd_clear(hcd, PORT_CSC);
+
+ retval = isp1760_hcd_clear_poll_timeout(hcd,
+ PORT_RESUME, 2000);
if (retval != 0) {
dev_err(hcd->self.controller,
"port %d resume error %d\n",
wIndex + 1, retval);
goto error;
}
- temp &= ~(PORT_SUSPEND|PORT_RESUME|(3<<10));
}
}
/* whoever resets must GetPortStatus to complete it!! */
- if ((temp & PORT_RESET)
- && time_after_eq(jiffies,
- priv->reset_done)) {
+ if (isp1760_hcd_is_set(hcd, PORT_RESET) &&
+ time_after_eq(jiffies, priv->reset_done)) {
status |= USB_PORT_STAT_C_RESET << 16;
priv->reset_done = 0;
/* force reset to complete */
- reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_RESET);
/* REVISIT: some hardware needs 550+ usec to clear
* this bit; seems too long to spin routinely...
*/
- retval = handshake(hcd, HC_PORTSC1,
- PORT_RESET, 0, 750);
+ retval = isp1760_hcd_clear_poll_timeout(hcd, PORT_RESET,
+ 750);
if (retval != 0) {
dev_err(hcd->self.controller, "port %d reset error %d\n",
wIndex + 1, retval);
@@ -1966,8 +1998,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
}
/* see what we found out */
- temp = check_reset_complete(hcd, wIndex,
- reg_read32(hcd->regs, HC_PORTSC1));
+ check_reset_complete(hcd, wIndex);
}
/*
* Even if OWNER is set, there's no harm letting hub_wq
@@ -1975,21 +2006,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
* for PORT_POWER anyway).
*/
- if (temp & PORT_OWNER)
+ if (isp1760_hcd_is_set(hcd, PORT_OWNER))
dev_err(hcd->self.controller, "PORT_OWNER is set\n");
- if (temp & PORT_CONNECT) {
+ if (isp1760_hcd_is_set(hcd, PORT_CONNECT)) {
status |= USB_PORT_STAT_CONNECTION;
/* status may be from integrated TT */
status |= USB_PORT_STAT_HIGH_SPEED;
}
- if (temp & PORT_PE)
+ if (isp1760_hcd_is_set(hcd, PORT_PE))
status |= USB_PORT_STAT_ENABLE;
- if (temp & (PORT_SUSPEND|PORT_RESUME))
+ if (isp1760_hcd_is_set(hcd, PORT_SUSPEND) &&
+ isp1760_hcd_is_set(hcd, PORT_RESUME))
status |= USB_PORT_STAT_SUSPEND;
- if (temp & PORT_RESET)
+ if (isp1760_hcd_is_set(hcd, PORT_RESET))
status |= USB_PORT_STAT_RESET;
- if (temp & PORT_POWER)
+ if (isp1760_hcd_is_set(hcd, PORT_POWER))
status |= USB_PORT_STAT_POWER;
put_unaligned(cpu_to_le32(status), (__le32 *) buf);
@@ -2009,41 +2041,39 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
if (!wIndex || wIndex > ports)
goto error;
wIndex--;
- temp = reg_read32(hcd->regs, HC_PORTSC1);
- if (temp & PORT_OWNER)
+ if (isp1760_hcd_is_set(hcd, PORT_OWNER))
break;
-/* temp &= ~PORT_RWC_BITS; */
switch (wValue) {
case USB_PORT_FEAT_ENABLE:
- reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_PE);
+ isp1760_hcd_set(hcd, PORT_PE);
break;
case USB_PORT_FEAT_SUSPEND:
- if ((temp & PORT_PE) == 0
- || (temp & PORT_RESET) != 0)
+ if (!isp1760_hcd_is_set(hcd, PORT_PE) ||
+ isp1760_hcd_is_set(hcd, PORT_RESET))
goto error;
- reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_SUSPEND);
+ isp1760_hcd_set(hcd, PORT_SUSPEND);
break;
case USB_PORT_FEAT_POWER:
- if (HCS_PPC(priv->hcs_params))
- reg_write32(hcd->regs, HC_PORTSC1,
- temp | PORT_POWER);
+ if (isp1760_hcd_is_set(hcd, HCS_PPC))
+ isp1760_hcd_set(hcd, PORT_POWER);
break;
case USB_PORT_FEAT_RESET:
- if (temp & PORT_RESUME)
+ if (isp1760_hcd_is_set(hcd, PORT_RESUME))
goto error;
/* line status bits may report this as low speed,
* which can be fine if this root hub has a
* transaction translator built in.
*/
- if ((temp & (PORT_PE|PORT_CONNECT)) == PORT_CONNECT
- && PORT_USB11(temp)) {
- temp |= PORT_OWNER;
+ if ((isp1760_hcd_is_set(hcd, PORT_CONNECT) &&
+ !isp1760_hcd_is_set(hcd, PORT_PE)) &&
+ (isp1760_hcd_read(hcd, PORT_LSTATUS) == 1)) {
+ isp1760_hcd_set(hcd, PORT_OWNER);
} else {
- temp |= PORT_RESET;
- temp &= ~PORT_PE;
+ isp1760_hcd_set(hcd, PORT_RESET);
+ isp1760_hcd_clear(hcd, PORT_PE);
/*
* caller must wait, then call GetPortStatus
@@ -2052,12 +2082,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
priv->reset_done = jiffies +
msecs_to_jiffies(50);
}
- reg_write32(hcd->regs, HC_PORTSC1, temp);
break;
default:
goto error;
}
- reg_read32(hcd->regs, HC_USBCMD);
+ isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
break;
default:
@@ -2074,14 +2103,13 @@ static int isp1760_get_frame(struct usb_hcd *hcd)
struct isp1760_hcd *priv = hcd_to_priv(hcd);
u32 fr;
- fr = reg_read32(hcd->regs, HC_FRINDEX);
+ fr = isp1760_hcd_read(hcd, HC_FRINDEX);
return (fr >> 3) % priv->periodic_size;
}
static void isp1760_stop(struct usb_hcd *hcd)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
- u32 temp;
del_timer(&errata2_timer);
@@ -2092,24 +2120,19 @@ static void isp1760_stop(struct usb_hcd *hcd)
spin_lock_irq(&priv->lock);
ehci_reset(hcd);
/* Disable IRQ */
- temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
- reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
+ isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
spin_unlock_irq(&priv->lock);
- reg_write32(hcd->regs, HC_CONFIGFLAG, 0);
+ isp1760_hcd_clear(hcd, FLAG_CF);
}
static void isp1760_shutdown(struct usb_hcd *hcd)
{
- u32 command, temp;
-
isp1760_stop(hcd);
- temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
- reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
- command = reg_read32(hcd->regs, HC_USBCMD);
- command &= ~CMD_RUN;
- reg_write32(hcd->regs, HC_USBCMD, command);
+ isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
+
+ isp1760_hcd_clear(hcd, CMD_RUN);
}
static void isp1760_clear_tt_buffer_complete(struct usb_hcd *hcd,
@@ -2182,8 +2205,8 @@ void isp1760_deinit_kmem_cache(void)
kmem_cache_destroy(urb_listitem_cachep);
}
-int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
- struct resource *mem, int irq, unsigned long irqflags,
+int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
+ int irq, unsigned long irqflags,
struct device *dev)
{
struct usb_hcd *hcd;
@@ -2200,7 +2223,6 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
init_memory(priv);
hcd->irq = irq;
- hcd->regs = regs;
hcd->rsrc_start = mem->start;
hcd->rsrc_len = resource_size(mem);
diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
index f1bb2deb1ccf..34e1899e52c4 100644
--- a/drivers/usb/isp1760/isp1760-hcd.h
+++ b/drivers/usb/isp1760/isp1760-hcd.h
@@ -3,6 +3,9 @@
#define _ISP1760_HCD_H_
#include <linux/spinlock.h>
+#include <linux/regmap.h>
+
+#include "isp1760-regs.h"
struct isp1760_qh;
struct isp1760_qtd;
@@ -48,10 +51,13 @@ enum isp1760_queue_head_types {
};
struct isp1760_hcd {
-#ifdef CONFIG_USB_ISP1760_HCD
struct usb_hcd *hcd;
- u32 hcs_params;
+ void __iomem *base;
+
+ struct regmap *regs;
+ struct regmap_field *fields[HC_FIELD_MAX];
+
spinlock_t lock;
struct isp1760_slotinfo atl_slots[32];
int atl_done_map;
@@ -66,20 +72,18 @@ struct isp1760_hcd {
unsigned i_thresh;
unsigned long reset_done;
unsigned long next_statechange;
-#endif
};
#ifdef CONFIG_USB_ISP1760_HCD
-int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
- struct resource *mem, int irq, unsigned long irqflags,
- struct device *dev);
+int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
+ int irq, unsigned long irqflags, struct device *dev);
void isp1760_hcd_unregister(struct isp1760_hcd *priv);
int isp1760_init_kmem_once(void);
void isp1760_deinit_kmem_cache(void);
#else
static inline int isp1760_hcd_register(struct isp1760_hcd *priv,
- void __iomem *regs, struct resource *mem,
+ struct resource *mem,
int irq, unsigned long irqflags,
struct device *dev)
{
diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index ccd30f835888..abfba9f5ec23 100644
--- a/drivers/usb/isp1760/isp1760-if.c
+++ b/drivers/usb/isp1760/isp1760-if.c
@@ -75,9 +75,9 @@ static int isp1761_pci_init(struct pci_dev *dev)
/*by default host is in 16bit mode, so
* io operations at this stage must be 16 bit
* */
- writel(0xface, iobase + HC_SCRATCH_REG);
+ writel(0xface, iobase + ISP176x_HC_SCRATCH);
udelay(100);
- reg_data = readl(iobase + HC_SCRATCH_REG) & 0x0000ffff;
+ reg_data = readl(iobase + ISP176x_HC_SCRATCH) & 0x0000ffff;
retry_count--;
}
diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
index fedc4f5cded0..42ee4404c90b 100644
--- a/drivers/usb/isp1760/isp1760-regs.h
+++ b/drivers/usb/isp1760/isp1760-regs.h
@@ -10,218 +10,286 @@
* Laurent Pinchart <laurent.pinchart@ideasonboard.com>
*/
-#ifndef _ISP1760_REGS_H_
-#define _ISP1760_REGS_H_
+#ifndef _ISP176x_REGS_H_
+#define _ISP176x_REGS_H_
+
+#include <linux/regmap.h>
/* -----------------------------------------------------------------------------
* Host Controller
*/
/* EHCI capability registers */
-#define HC_CAPLENGTH 0x000
-#define HC_LENGTH(p) (((p) >> 00) & 0x00ff) /* bits 7:0 */
-#define HC_VERSION(p) (((p) >> 16) & 0xffff) /* bits 31:16 */
-
-#define HC_HCSPARAMS 0x004
-#define HCS_INDICATOR(p) ((p) & (1 << 16)) /* true: has port indicators */
-#define HCS_PPC(p) ((p) & (1 << 4)) /* true: port power control */
-#define HCS_N_PORTS(p) (((p) >> 0) & 0xf) /* bits 3:0, ports on HC */
-
-#define HC_HCCPARAMS 0x008
-#define HCC_ISOC_CACHE(p) ((p) & (1 << 7)) /* true: can cache isoc frame */
-#define HCC_ISOC_THRES(p) (((p) >> 4) & 0x7) /* bits 6:4, uframes cached */
+#define ISP176x_HC_CAPLENGTH 0x000
+#define ISP176x_HC_VERSION 0x002
+#define ISP176x_HC_HCSPARAMS 0x004
+#define ISP176x_HC_HCCPARAMS 0x008
/* EHCI operational registers */
-#define HC_USBCMD 0x020
-#define CMD_LRESET (1 << 7) /* partial reset (no ports, etc) */
-#define CMD_RESET (1 << 1) /* reset HC not bus */
-#define CMD_RUN (1 << 0) /* start/stop HC */
-
-#define HC_USBSTS 0x024
-#define STS_PCD (1 << 2) /* port change detect */
-
-#define HC_FRINDEX 0x02c
-
-#define HC_CONFIGFLAG 0x060
-#define FLAG_CF (1 << 0) /* true: we'll support "high speed" */
-
-#define HC_PORTSC1 0x064
-#define PORT_OWNER (1 << 13) /* true: companion hc owns this port */
-#define PORT_POWER (1 << 12) /* true: has power (see PPC) */
-#define PORT_USB11(x) (((x) & (3 << 10)) == (1 << 10)) /* USB 1.1 device */
-#define PORT_RESET (1 << 8) /* reset port */
-#define PORT_SUSPEND (1 << 7) /* suspend port */
-#define PORT_RESUME (1 << 6) /* resume it */
-#define PORT_PE (1 << 2) /* port enable */
-#define PORT_CSC (1 << 1) /* connect status change */
-#define PORT_CONNECT (1 << 0) /* device connected */
-#define PORT_RWC_BITS (PORT_CSC)
-
-#define HC_ISO_PTD_DONEMAP_REG 0x130
-#define HC_ISO_PTD_SKIPMAP_REG 0x134
-#define HC_ISO_PTD_LASTPTD_REG 0x138
-#define HC_INT_PTD_DONEMAP_REG 0x140
-#define HC_INT_PTD_SKIPMAP_REG 0x144
-#define HC_INT_PTD_LASTPTD_REG 0x148
-#define HC_ATL_PTD_DONEMAP_REG 0x150
-#define HC_ATL_PTD_SKIPMAP_REG 0x154
-#define HC_ATL_PTD_LASTPTD_REG 0x158
+#define ISP176x_HC_USBCMD 0x020
+#define ISP176x_HC_USBSTS 0x024
+#define ISP176x_HC_FRINDEX 0x02c
+
+#define ISP176x_HC_CONFIGFLAG 0x060
+#define ISP176x_HC_PORTSC1 0x064
+
+#define ISP176x_HC_ISO_PTD_DONEMAP 0x130
+#define ISP176x_HC_ISO_PTD_SKIPMAP 0x134
+#define ISP176x_HC_ISO_PTD_LASTPTD 0x138
+#define ISP176x_HC_INT_PTD_DONEMAP 0x140
+#define ISP176x_HC_INT_PTD_SKIPMAP 0x144
+#define ISP176x_HC_INT_PTD_LASTPTD 0x148
+#define ISP176x_HC_ATL_PTD_DONEMAP 0x150
+#define ISP176x_HC_ATL_PTD_SKIPMAP 0x154
+#define ISP176x_HC_ATL_PTD_LASTPTD 0x158
/* Configuration Register */
-#define HC_HW_MODE_CTRL 0x300
-#define ALL_ATX_RESET (1 << 31)
-#define HW_ANA_DIGI_OC (1 << 15)
-#define HW_DEV_DMA (1 << 11)
-#define HW_COMN_IRQ (1 << 10)
-#define HW_COMN_DMA (1 << 9)
-#define HW_DATA_BUS_32BIT (1 << 8)
-#define HW_DACK_POL_HIGH (1 << 6)
-#define HW_DREQ_POL_HIGH (1 << 5)
-#define HW_INTR_HIGH_ACT (1 << 2)
-#define HW_INTR_EDGE_TRIG (1 << 1)
-#define HW_GLOBAL_INTR_EN (1 << 0)
-
-#define HC_CHIP_ID_REG 0x304
-#define HC_SCRATCH_REG 0x308
-
-#define HC_RESET_REG 0x30c
-#define SW_RESET_RESET_HC (1 << 1)
-#define SW_RESET_RESET_ALL (1 << 0)
-
-#define HC_BUFFER_STATUS_REG 0x334
-#define ISO_BUF_FILL (1 << 2)
-#define INT_BUF_FILL (1 << 1)
-#define ATL_BUF_FILL (1 << 0)
-
-#define HC_MEMORY_REG 0x33c
-#define ISP_BANK(x) ((x) << 16)
-
-#define HC_PORT1_CTRL 0x374
-#define PORT1_POWER (3 << 3)
-#define PORT1_INIT1 (1 << 7)
-#define PORT1_INIT2 (1 << 23)
-#define HW_OTG_CTRL_SET 0x374
-#define HW_OTG_CTRL_CLR 0x376
-#define HW_OTG_DISABLE (1 << 10)
-#define HW_OTG_SE0_EN (1 << 9)
-#define HW_BDIS_ACON_EN (1 << 8)
-#define HW_SW_SEL_HC_DC (1 << 7)
-#define HW_VBUS_CHRG (1 << 6)
-#define HW_VBUS_DISCHRG (1 << 5)
-#define HW_VBUS_DRV (1 << 4)
-#define HW_SEL_CP_EXT (1 << 3)
-#define HW_DM_PULLDOWN (1 << 2)
-#define HW_DP_PULLDOWN (1 << 1)
-#define HW_DP_PULLUP (1 << 0)
+#define ISP176x_HC_HW_MODE_CTRL 0x300
+#define ISP176x_HC_CHIP_ID 0x304
+#define ISP176x_HC_SCRATCH 0x308
+#define ISP176x_HC_RESET 0x30c
+#define ISP176x_HC_BUFFER_STATUS 0x334
+#define ISP176x_HC_MEMORY 0x33c
/* Interrupt Register */
-#define HC_INTERRUPT_REG 0x310
-
-#define HC_INTERRUPT_ENABLE 0x314
-#define HC_ISO_INT (1 << 9)
-#define HC_ATL_INT (1 << 8)
-#define HC_INTL_INT (1 << 7)
-#define HC_EOT_INT (1 << 3)
-#define HC_SOT_INT (1 << 1)
-#define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT)
-
-#define HC_ISO_IRQ_MASK_OR_REG 0x318
-#define HC_INT_IRQ_MASK_OR_REG 0x31c
-#define HC_ATL_IRQ_MASK_OR_REG 0x320
-#define HC_ISO_IRQ_MASK_AND_REG 0x324
-#define HC_INT_IRQ_MASK_AND_REG 0x328
-#define HC_ATL_IRQ_MASK_AND_REG 0x32c
+#define ISP176x_HC_INTERRUPT 0x310
+#define ISP176x_HC_INTERRUPT_ENABLE 0x314
+#define ISP176x_HC_ISO_IRQ_MASK_OR 0x318
+#define ISP176x_HC_INT_IRQ_MASK_OR 0x31c
+#define ISP176x_HC_ATL_IRQ_MASK_OR 0x320
+#define ISP176x_HC_ISO_IRQ_MASK_AND 0x324
+#define ISP176x_HC_INT_IRQ_MASK_AND 0x328
+#define ISP176x_HC_ATL_IRQ_MASK_AND 0x32c
+
+static const struct regmap_range isp176x_hc_volatile_ranges[] = {
+ regmap_reg_range(ISP176x_HC_USBCMD, ISP176x_HC_ATL_PTD_LASTPTD),
+ regmap_reg_range(ISP176x_HC_BUFFER_STATUS, ISP176x_HC_MEMORY),
+ regmap_reg_range(ISP176x_HC_INTERRUPT, ISP176x_HC_ATL_IRQ_MASK_AND),
+};
+
+static const struct regmap_access_table isp176x_hc_volatile_table = {
+ .yes_ranges = isp176x_hc_volatile_ranges,
+ .n_yes_ranges = ARRAY_SIZE(isp176x_hc_volatile_ranges),
+};
+
+enum isp176x_host_controller_fields {
+ /* HC_HCSPARAMS */
+ HCS_PPC, HCS_N_PORTS,
+ /* HC_HCCPARAMS */
+ HCC_ISOC_CACHE, HCC_ISOC_THRES,
+ /* HC_USBCMD */
+ CMD_LRESET, CMD_RESET, CMD_RUN,
+ /* HC_USBSTS */
+ STS_PCD,
+ /* HC_FRINDEX */
+ HC_FRINDEX,
+ /* HC_CONFIGFLAG */
+ FLAG_CF,
+ /* HC_PORTSC1 */
+ PORT_OWNER, PORT_POWER, PORT_LSTATUS, PORT_RESET, PORT_SUSPEND,
+ PORT_RESUME, PORT_PE, PORT_CSC, PORT_CONNECT,
+ /* HC_HW_MODE_CTRL */
+ ALL_ATX_RESET, HW_ANA_DIGI_OC, HW_DEV_DMA, HW_COMN_IRQ, HW_COMN_DMA,
+ HW_DATA_BUS_WIDTH, HW_DACK_POL_HIGH, HW_DREQ_POL_HIGH, HW_INTR_HIGH_ACT,
+ HW_INTR_EDGE_TRIG, HW_GLOBAL_INTR_EN,
+ /* HC_RESET */
+ SW_RESET_RESET_HC, SW_RESET_RESET_ALL,
+ /* HC_BUFFER_STATUS */
+ INT_BUF_FILL, ATL_BUF_FILL,
+ /* HC_MEMORY */
+ MEM_BANK_SEL, MEM_START_ADDR,
+ /* HC_INTERRUPT_ENABLE */
+ HC_INT_ENABLE,
+ /* Last element */
+ HC_FIELD_MAX,
+};
+
+static const struct reg_field isp1760_hc_reg_fields[] = {
+ [HCS_PPC] = REG_FIELD(ISP176x_HC_HCSPARAMS, 4, 4),
+ [HCS_N_PORTS] = REG_FIELD(ISP176x_HC_HCSPARAMS, 0, 3),
+ [HCC_ISOC_CACHE] = REG_FIELD(ISP176x_HC_HCCPARAMS, 7, 7),
+ [HCC_ISOC_THRES] = REG_FIELD(ISP176x_HC_HCCPARAMS, 4, 6),
+ [CMD_LRESET] = REG_FIELD(ISP176x_HC_USBCMD, 7, 7),
+ [CMD_RESET] = REG_FIELD(ISP176x_HC_USBCMD, 1, 1),
+ [CMD_RUN] = REG_FIELD(ISP176x_HC_USBCMD, 0, 0),
+ [STS_PCD] = REG_FIELD(ISP176x_HC_USBSTS, 2, 2),
+ [HC_FRINDEX] = REG_FIELD(ISP176x_HC_FRINDEX, 0, 13),
+ [FLAG_CF] = REG_FIELD(ISP176x_HC_CONFIGFLAG, 0, 0),
+ [PORT_OWNER] = REG_FIELD(ISP176x_HC_PORTSC1, 13, 13),
+ [PORT_POWER] = REG_FIELD(ISP176x_HC_PORTSC1, 12, 12),
+ [PORT_LSTATUS] = REG_FIELD(ISP176x_HC_PORTSC1, 10, 11),
+ [PORT_RESET] = REG_FIELD(ISP176x_HC_PORTSC1, 8, 8),
+ [PORT_SUSPEND] = REG_FIELD(ISP176x_HC_PORTSC1, 7, 7),
+ [PORT_RESUME] = REG_FIELD(ISP176x_HC_PORTSC1, 6, 6),
+ [PORT_PE] = REG_FIELD(ISP176x_HC_PORTSC1, 2, 2),
+ [PORT_CSC] = REG_FIELD(ISP176x_HC_PORTSC1, 1, 1),
+ [PORT_CONNECT] = REG_FIELD(ISP176x_HC_PORTSC1, 0, 0),
+ [ALL_ATX_RESET] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 31, 31),
+ [HW_ANA_DIGI_OC] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 15, 15),
+ [HW_COMN_IRQ] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 10, 10),
+ [HW_DATA_BUS_WIDTH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 8, 8),
+ [HW_DACK_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 6, 6),
+ [HW_DREQ_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 5, 5),
+ [HW_INTR_HIGH_ACT] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 2, 2),
+ [HW_INTR_EDGE_TRIG] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 1, 1),
+ [HW_GLOBAL_INTR_EN] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 0, 0),
+ [SW_RESET_RESET_ALL] = REG_FIELD(ISP176x_HC_RESET, 0, 0),
+ [INT_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 1, 1),
+ [ATL_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 0, 0),
+ [MEM_BANK_SEL] = REG_FIELD(ISP176x_HC_MEMORY, 16, 17),
+ [MEM_START_ADDR] = REG_FIELD(ISP176x_HC_MEMORY, 0, 15),
+ [HC_INT_ENABLE] = REG_FIELD(ISP176x_HC_INTERRUPT_ENABLE, 7, 8),
+};
/* -----------------------------------------------------------------------------
* Peripheral Controller
*/
-/* Initialization Registers */
-#define DC_ADDRESS 0x0200
-#define DC_DEVEN (1 << 7)
-
-#define DC_MODE 0x020c
-#define DC_DMACLKON (1 << 9)
-#define DC_VBUSSTAT (1 << 8)
-#define DC_CLKAON (1 << 7)
-#define DC_SNDRSU (1 << 6)
-#define DC_GOSUSP (1 << 5)
-#define DC_SFRESET (1 << 4)
-#define DC_GLINTENA (1 << 3)
-#define DC_WKUPCS (1 << 2)
-
-#define DC_INTCONF 0x0210
-#define DC_CDBGMOD_ACK_NAK (0 << 6)
-#define DC_CDBGMOD_ACK (1 << 6)
-#define DC_CDBGMOD_ACK_1NAK (2 << 6)
-#define DC_DDBGMODIN_ACK_NAK (0 << 4)
-#define DC_DDBGMODIN_ACK (1 << 4)
-#define DC_DDBGMODIN_ACK_1NAK (2 << 4)
-#define DC_DDBGMODOUT_ACK_NYET_NAK (0 << 2)
-#define DC_DDBGMODOUT_ACK_NYET (1 << 2)
-#define DC_DDBGMODOUT_ACK_NYET_1NAK (2 << 2)
-#define DC_INTLVL (1 << 1)
-#define DC_INTPOL (1 << 0)
-
-#define DC_DEBUG 0x0212
-#define DC_INTENABLE 0x0214
#define DC_IEPTX(n) (1 << (11 + 2 * (n)))
#define DC_IEPRX(n) (1 << (10 + 2 * (n)))
#define DC_IEPRXTX(n) (3 << (10 + 2 * (n)))
-#define DC_IEP0SETUP (1 << 8)
-#define DC_IEVBUS (1 << 7)
-#define DC_IEDMA (1 << 6)
-#define DC_IEHS_STA (1 << 5)
-#define DC_IERESM (1 << 4)
-#define DC_IESUSP (1 << 3)
-#define DC_IEPSOF (1 << 2)
-#define DC_IESOF (1 << 1)
-#define DC_IEBRST (1 << 0)
+
+#define ISP176x_DC_ENDPTYP_ISOC 0x01
+#define ISP176x_DC_ENDPTYP_BULK 0x02
+#define ISP176x_DC_ENDPTYP_INTERRUPT 0x03
+
+/* Initialization Registers */
+#define ISP176x_DC_ADDRESS 0x0200
+#define ISP176x_DC_MODE 0x020c
+#define ISP176x_DC_INTCONF 0x0210
+#define ISP176x_DC_DEBUG 0x0212
+#define ISP176x_DC_INTENABLE 0x0214
/* Data Flow Registers */
-#define DC_EPINDEX 0x022c
-#define DC_EP0SETUP (1 << 5)
-#define DC_ENDPIDX(n) ((n) << 1)
-#define DC_EPDIR (1 << 0)
-
-#define DC_CTRLFUNC 0x0228
-#define DC_CLBUF (1 << 4)
-#define DC_VENDP (1 << 3)
-#define DC_DSEN (1 << 2)
-#define DC_STATUS (1 << 1)
-#define DC_STALL (1 << 0)
-
-#define DC_DATAPORT 0x0220
-#define DC_BUFLEN 0x021c
-#define DC_DATACOUNT_MASK 0xffff
-#define DC_BUFSTAT 0x021e
-#define DC_EPMAXPKTSZ 0x0204
-
-#define DC_EPTYPE 0x0208
-#define DC_NOEMPKT (1 << 4)
-#define DC_EPENABLE (1 << 3)
-#define DC_DBLBUF (1 << 2)
-#define DC_ENDPTYP_ISOC (1 << 0)
-#define DC_ENDPTYP_BULK (2 << 0)
-#define DC_ENDPTYP_INTERRUPT (3 << 0)
+#define ISP176x_DC_EPMAXPKTSZ 0x0204
+#define ISP176x_DC_EPTYPE 0x0208
+
+#define ISP176x_DC_BUFLEN 0x021c
+#define ISP176x_DC_BUFSTAT 0x021e
+#define ISP176x_DC_DATAPORT 0x0220
+
+#define ISP176x_DC_CTRLFUNC 0x0228
+#define ISP176x_DC_EPINDEX 0x022c
+
+#define ISP1761_DC_OTG_CTRL_SET 0x374
+#define ISP1761_DC_OTG_CTRL_CLEAR 0x376
/* DMA Registers */
-#define DC_DMACMD 0x0230
-#define DC_DMATXCOUNT 0x0234
-#define DC_DMACONF 0x0238
-#define DC_DMAHW 0x023c
-#define DC_DMAINTREASON 0x0250
-#define DC_DMAINTEN 0x0254
-#define DC_DMAEP 0x0258
-#define DC_DMABURSTCOUNT 0x0264
+#define ISP176x_DC_DMACMD 0x0230
+#define ISP176x_DC_DMATXCOUNT 0x0234
+#define ISP176x_DC_DMACONF 0x0238
+#define ISP176x_DC_DMAHW 0x023c
+#define ISP176x_DC_DMAINTREASON 0x0250
+#define ISP176x_DC_DMAINTEN 0x0254
+#define ISP176x_DC_DMAEP 0x0258
+#define ISP176x_DC_DMABURSTCOUNT 0x0264
/* General Registers */
-#define DC_INTERRUPT 0x0218
-#define DC_CHIPID 0x0270
-#define DC_FRAMENUM 0x0274
-#define DC_SCRATCH 0x0278
-#define DC_UNLOCKDEV 0x027c
-#define DC_INTPULSEWIDTH 0x0280
-#define DC_TESTMODE 0x0284
+#define ISP176x_DC_INTERRUPT 0x0218
+#define ISP176x_DC_CHIPID 0x0270
+#define ISP176x_DC_FRAMENUM 0x0274
+#define ISP176x_DC_SCRATCH 0x0278
+#define ISP176x_DC_UNLOCKDEV 0x027c
+#define ISP176x_DC_INTPULSEWIDTH 0x0280
+#define ISP176x_DC_TESTMODE 0x0284
+
+static const struct regmap_range isp176x_dc_volatile_ranges[] = {
+ regmap_reg_range(ISP176x_DC_EPMAXPKTSZ, ISP176x_DC_EPTYPE),
+ regmap_reg_range(ISP176x_DC_BUFLEN, ISP176x_DC_EPINDEX),
+ regmap_reg_range(ISP1761_DC_OTG_CTRL_SET, ISP1761_DC_OTG_CTRL_CLEAR),
+};
+
+static const struct regmap_access_table isp176x_dc_volatile_table = {
+ .yes_ranges = isp176x_dc_volatile_ranges,
+ .n_yes_ranges = ARRAY_SIZE(isp176x_dc_volatile_ranges),
+};
+
+enum isp176x_device_controller_fields {
+ /* DC_ADDRESS */
+ DC_DEVEN, DC_DEVADDR,
+ /* DC_MODE */
+ DC_VBUSSTAT, DC_SFRESET, DC_GLINTENA,
+ /* DC_INTCONF */
+ DC_CDBGMOD_ACK, DC_DDBGMODIN_ACK, DC_DDBGMODOUT_ACK, DC_INTPOL,
+ /* DC_INTENABLE */
+ DC_IEPRXTX_7, DC_IEPRXTX_6, DC_IEPRXTX_5, DC_IEPRXTX_4, DC_IEPRXTX_3,
+ DC_IEPRXTX_2, DC_IEPRXTX_1, DC_IEPRXTX_0,
+ DC_IEP0SETUP, DC_IEVBUS, DC_IEHS_STA, DC_IERESM, DC_IESUSP, DC_IEBRST,
+ /* DC_EPINDEX */
+ DC_EP0SETUP, DC_ENDPIDX, DC_EPDIR,
+ /* DC_CTRLFUNC */
+ DC_CLBUF, DC_VENDP, DC_DSEN, DC_STATUS, DC_STALL,
+ /* DC_BUFLEN */
+ DC_BUFLEN,
+ /* DC_EPMAXPKTSZ */
+ DC_FFOSZ,
+ /* DC_EPTYPE */
+ DC_EPENABLE, DC_ENDPTYP,
+ /* DC_FRAMENUM */
+ DC_FRAMENUM, DC_UFRAMENUM,
+ /* HW_OTG_CTRL_SET */
+ HW_OTG_DISABLE, HW_SW_SEL_HC_DC, HW_VBUS_DRV, HW_SEL_CP_EXT,
+ HW_DM_PULLDOWN, HW_DP_PULLDOWN, HW_DP_PULLUP,
+ /* HW_OTG_CTRL_CLR */
+ HW_OTG_DISABLE_CLEAR, HW_SW_SEL_HC_DC_CLEAR, HW_VBUS_DRV_CLEAR,
+ HW_SEL_CP_EXT_CLEAR, HW_DM_PULLDOWN_CLEAR, HW_DP_PULLDOWN_CLEAR,
+ HW_DP_PULLUP_CLEAR,
+ /* Last element */
+ DC_FIELD_MAX,
+};
+
+static const struct reg_field isp1761_dc_reg_fields[] = {
+ [DC_DEVEN] = REG_FIELD(ISP176x_DC_ADDRESS, 7, 7),
+ [DC_DEVADDR] = REG_FIELD(ISP176x_DC_ADDRESS, 0, 6),
+ [DC_VBUSSTAT] = REG_FIELD(ISP176x_DC_MODE, 8, 8),
+ [DC_SFRESET] = REG_FIELD(ISP176x_DC_MODE, 4, 4),
+ [DC_GLINTENA] = REG_FIELD(ISP176x_DC_MODE, 3, 3),
+ [DC_CDBGMOD_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 6, 6),
+ [DC_DDBGMODIN_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 4, 4),
+ [DC_DDBGMODOUT_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 2, 2),
+ [DC_INTPOL] = REG_FIELD(ISP176x_DC_INTCONF, 0, 0),
+ [DC_IEPRXTX_7] = REG_FIELD(ISP176x_DC_INTENABLE, 25, 25),
+ [DC_IEPRXTX_6] = REG_FIELD(ISP176x_DC_INTENABLE, 23, 23),
+ [DC_IEPRXTX_5] = REG_FIELD(ISP176x_DC_INTENABLE, 21, 21),
+ [DC_IEPRXTX_4] = REG_FIELD(ISP176x_DC_INTENABLE, 19, 19),
+ [DC_IEPRXTX_3] = REG_FIELD(ISP176x_DC_INTENABLE, 17, 17),
+ [DC_IEPRXTX_2] = REG_FIELD(ISP176x_DC_INTENABLE, 15, 15),
+ [DC_IEPRXTX_1] = REG_FIELD(ISP176x_DC_INTENABLE, 13, 13),
+ [DC_IEPRXTX_0] = REG_FIELD(ISP176x_DC_INTENABLE, 11, 11),
+ [DC_IEP0SETUP] = REG_FIELD(ISP176x_DC_INTENABLE, 8, 8),
+ [DC_IEVBUS] = REG_FIELD(ISP176x_DC_INTENABLE, 7, 7),
+ [DC_IEHS_STA] = REG_FIELD(ISP176x_DC_INTENABLE, 5, 5),
+ [DC_IERESM] = REG_FIELD(ISP176x_DC_INTENABLE, 4, 4),
+ [DC_IESUSP] = REG_FIELD(ISP176x_DC_INTENABLE, 3, 3),
+ [DC_IEBRST] = REG_FIELD(ISP176x_DC_INTENABLE, 0, 0),
+ [DC_EP0SETUP] = REG_FIELD(ISP176x_DC_EPINDEX, 5, 5),
+ [DC_ENDPIDX] = REG_FIELD(ISP176x_DC_EPINDEX, 1, 4),
+ [DC_EPDIR] = REG_FIELD(ISP176x_DC_EPINDEX, 0, 0),
+ [DC_CLBUF] = REG_FIELD(ISP176x_DC_CTRLFUNC, 4, 4),
+ [DC_VENDP] = REG_FIELD(ISP176x_DC_CTRLFUNC, 3, 3),
+ [DC_DSEN] = REG_FIELD(ISP176x_DC_CTRLFUNC, 2, 2),
+ [DC_STATUS] = REG_FIELD(ISP176x_DC_CTRLFUNC, 1, 1),
+ [DC_STALL] = REG_FIELD(ISP176x_DC_CTRLFUNC, 0, 0),
+ [DC_BUFLEN] = REG_FIELD(ISP176x_DC_BUFLEN, 0, 15),
+ [DC_FFOSZ] = REG_FIELD(ISP176x_DC_EPMAXPKTSZ, 0, 10),
+ [DC_EPENABLE] = REG_FIELD(ISP176x_DC_EPTYPE, 3, 3),
+ [DC_ENDPTYP] = REG_FIELD(ISP176x_DC_EPTYPE, 0, 1),
+ [DC_UFRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 11, 13),
+ [DC_FRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 0, 10),
+ [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 10, 10),
+ [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 7, 7),
+ [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 4, 4),
+ [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 3, 3),
+ [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 2, 2),
+ [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 1, 1),
+ [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 0, 0),
+ [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 10, 10),
+ [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 7, 7),
+ [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 4, 4),
+ [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 3, 3),
+ [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 2, 2),
+ [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 1, 1),
+ [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 0, 0),
+};
#endif
diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
index 1714b2258b54..1ce21ef291b6 100644
--- a/drivers/usb/isp1760/isp1760-udc.c
+++ b/drivers/usb/isp1760/isp1760-udc.c
@@ -45,16 +45,62 @@ static inline struct isp1760_request *req_to_udc_req(struct usb_request *req)
return container_of(req, struct isp1760_request, req);
}
-static inline u32 isp1760_udc_read(struct isp1760_udc *udc, u16 reg)
+static u32 isp1760_udc_read(struct isp1760_udc *udc, u16 field)
{
- return isp1760_read32(udc->regs, reg);
+ return isp1760_field_read(udc->fields, field);
}
-static inline void isp1760_udc_write(struct isp1760_udc *udc, u16 reg, u32 val)
+static void isp1760_udc_write(struct isp1760_udc *udc, u16 field, u32 val)
{
- isp1760_write32(udc->regs, reg, val);
+ isp1760_field_write(udc->fields, field, val);
}
+static u32 isp1760_udc_read_raw(struct isp1760_udc *udc, u16 reg)
+{
+ u32 val;
+
+ regmap_raw_read(udc->regs, reg, &val, 4);
+
+ return le32_to_cpu(val);
+}
+
+static u16 isp1760_udc_read_raw16(struct isp1760_udc *udc, u16 reg)
+{
+ u16 val;
+
+ regmap_raw_read(udc->regs, reg, &val, 2);
+
+ return le16_to_cpu(val);
+}
+
+static void isp1760_udc_write_raw(struct isp1760_udc *udc, u16 reg, u32 val)
+{
+ val = cpu_to_le32(val);
+
+ regmap_raw_write(udc->regs, reg, &val, 4);
+}
+
+static void isp1760_udc_write_raw16(struct isp1760_udc *udc, u16 reg, u16 val)
+{
+ val = cpu_to_le16(val);
+
+ regmap_raw_write(udc->regs, reg, &val, 2);
+}
+
+static void isp1760_udc_set(struct isp1760_udc *udc, u32 field)
+{
+ isp1760_udc_write(udc, field, 0xFFFFFFFF);
+}
+
+static void isp1760_udc_clear(struct isp1760_udc *udc, u32 field)
+{
+ isp1760_udc_write(udc, field, 0);
+}
+
+static bool isp1760_udc_is_set(struct isp1760_udc *udc, u32 field)
+{
+ return !!isp1760_udc_read(udc, field);
+}
/* -----------------------------------------------------------------------------
* Endpoint Management
*/
@@ -75,11 +121,15 @@ static struct isp1760_ep *isp1760_udc_find_ep(struct isp1760_udc *udc,
return NULL;
}
-static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
+static void __isp1760_udc_select_ep(struct isp1760_udc *udc,
+ struct isp1760_ep *ep, int dir)
{
- isp1760_udc_write(ep->udc, DC_EPINDEX,
- DC_ENDPIDX(ep->addr & USB_ENDPOINT_NUMBER_MASK) |
- (dir == USB_DIR_IN ? DC_EPDIR : 0));
+ isp1760_udc_write(udc, DC_ENDPIDX, ep->addr & USB_ENDPOINT_NUMBER_MASK);
+
+ if (dir == USB_DIR_IN)
+ isp1760_udc_set(udc, DC_EPDIR);
+ else
+ isp1760_udc_clear(udc, DC_EPDIR);
}
/**
@@ -93,9 +143,10 @@ static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
*
* Called with the UDC spinlock held.
*/
-static void isp1760_udc_select_ep(struct isp1760_ep *ep)
+static void isp1760_udc_select_ep(struct isp1760_udc *udc,
+ struct isp1760_ep *ep)
{
- __isp1760_udc_select_ep(ep, ep->addr & USB_ENDPOINT_DIR_MASK);
+ __isp1760_udc_select_ep(udc, ep, ep->addr & USB_ENDPOINT_DIR_MASK);
}
/* Called with the UDC spinlock held. */
@@ -108,9 +159,13 @@ static void isp1760_udc_ctrl_send_status(struct isp1760_ep *ep, int dir)
* the direction opposite to the data stage data packets, we thus need
* to select the OUT/IN endpoint for IN/OUT transfers.
*/
- isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) |
- (dir == USB_DIR_IN ? 0 : DC_EPDIR));
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_STATUS);
+ if (dir == USB_DIR_IN)
+ isp1760_udc_clear(udc, DC_EPDIR);
+ else
+ isp1760_udc_set(udc, DC_EPDIR);
+
+ isp1760_udc_write(udc, DC_ENDPIDX, 1);
+ isp1760_udc_set(udc, DC_STATUS);
/*
* The hardware will terminate the request automatically and go back to
@@ -157,10 +212,10 @@ static void isp1760_udc_ctrl_send_stall(struct isp1760_ep *ep)
spin_lock_irqsave(&udc->lock, flags);
/* Stall both the IN and OUT endpoints. */
- __isp1760_udc_select_ep(ep, USB_DIR_OUT);
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
- __isp1760_udc_select_ep(ep, USB_DIR_IN);
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
+ __isp1760_udc_select_ep(udc, ep, USB_DIR_OUT);
+ isp1760_udc_set(udc, DC_STALL);
+ __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
+ isp1760_udc_set(udc, DC_STALL);
/* A protocol stall completes the control transaction. */
udc->ep0_state = ISP1760_CTRL_SETUP;
@@ -181,8 +236,8 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
u32 *buf;
int i;
- isp1760_udc_select_ep(ep);
- len = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
+ isp1760_udc_select_ep(udc, ep);
+ len = isp1760_udc_read(udc, DC_BUFLEN);
dev_dbg(udc->isp->dev, "%s: received %u bytes (%u/%u done)\n",
__func__, len, req->req.actual, req->req.length);
@@ -198,7 +253,7 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
* datasheet doesn't clearly document how this should be
* handled.
*/
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
+ isp1760_udc_set(udc, DC_CLBUF);
return false;
}
@@ -209,9 +264,9 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
* the next packet might be removed from the FIFO.
*/
for (i = len; i > 2; i -= 4, ++buf)
- *buf = le32_to_cpu(isp1760_udc_read(udc, DC_DATAPORT));
+ *buf = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
if (i > 0)
- *(u16 *)buf = le16_to_cpu(readw(udc->regs + DC_DATAPORT));
+ *(u16 *)buf = isp1760_udc_read_raw16(udc, ISP176x_DC_DATAPORT);
req->req.actual += len;
@@ -253,7 +308,7 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
__func__, req->packet_size, req->req.actual,
req->req.length);
- __isp1760_udc_select_ep(ep, USB_DIR_IN);
+ __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
if (req->packet_size)
isp1760_udc_write(udc, DC_BUFLEN, req->packet_size);
@@ -265,14 +320,14 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
* the FIFO for this kind of conditions, but doesn't seem to work.
*/
for (i = req->packet_size; i > 2; i -= 4, ++buf)
- isp1760_udc_write(udc, DC_DATAPORT, cpu_to_le32(*buf));
+ isp1760_udc_write_raw(udc, ISP176x_DC_DATAPORT, *buf);
if (i > 0)
- writew(cpu_to_le16(*(u16 *)buf), udc->regs + DC_DATAPORT);
+ isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, *(u16 *)buf);
if (ep->addr == 0)
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
+ isp1760_udc_set(udc, DC_DSEN);
if (!req->packet_size)
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_VENDP);
+ isp1760_udc_set(udc, DC_VENDP);
}
static void isp1760_ep_rx_ready(struct isp1760_ep *ep)
@@ -408,19 +463,24 @@ static int __isp1760_udc_set_halt(struct isp1760_ep *ep, bool halt)
return -EINVAL;
}
- isp1760_udc_select_ep(ep);
- isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
+ isp1760_udc_select_ep(udc, ep);
+
+ if (halt)
+ isp1760_udc_set(udc, DC_STALL);
+ else
+ isp1760_udc_clear(udc, DC_STALL);
if (ep->addr == 0) {
/* When halting the control endpoint, stall both IN and OUT. */
- __isp1760_udc_select_ep(ep, USB_DIR_IN);
- isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
+ __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
+ if (halt)
+ isp1760_udc_set(udc, DC_STALL);
+ else
+ isp1760_udc_clear(udc, DC_STALL);
} else if (!halt) {
/* Reset the data PID by cycling the endpoint enable bit. */
- u16 eptype = isp1760_udc_read(udc, DC_EPTYPE);
-
- isp1760_udc_write(udc, DC_EPTYPE, eptype & ~DC_EPENABLE);
- isp1760_udc_write(udc, DC_EPTYPE, eptype);
+ isp1760_udc_clear(udc, DC_EPENABLE);
+ isp1760_udc_set(udc, DC_EPENABLE);
/*
* Disabling the endpoint emptied the transmit FIFO, fill it
@@ -479,12 +539,14 @@ static int isp1760_udc_get_status(struct isp1760_udc *udc,
return -EINVAL;
}
- isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) | DC_EPDIR);
+ isp1760_udc_set(udc, DC_EPDIR);
+ isp1760_udc_write(udc, DC_ENDPIDX, 1);
+
isp1760_udc_write(udc, DC_BUFLEN, 2);
- writew(cpu_to_le16(status), udc->regs + DC_DATAPORT);
+ isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, status);
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
+ isp1760_udc_set(udc, DC_DSEN);
dev_dbg(udc->isp->dev, "%s: status 0x%04x\n", __func__, status);
@@ -508,7 +570,8 @@ static int isp1760_udc_set_address(struct isp1760_udc *udc, u16 addr)
usb_gadget_set_state(&udc->gadget, addr ? USB_STATE_ADDRESS :
USB_STATE_DEFAULT);
- isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN | addr);
+ isp1760_udc_write(udc, DC_DEVADDR, addr);
+ isp1760_udc_set(udc, DC_DEVEN);
spin_lock(&udc->lock);
isp1760_udc_ctrl_send_status(&udc->ep[0], USB_DIR_OUT);
@@ -650,9 +713,9 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
spin_lock(&udc->lock);
- isp1760_udc_write(udc, DC_EPINDEX, DC_EP0SETUP);
+ isp1760_udc_set(udc, DC_EP0SETUP);
- count = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
+ count = isp1760_udc_read(udc, DC_BUFLEN);
if (count != sizeof(req)) {
spin_unlock(&udc->lock);
@@ -663,8 +726,8 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
return;
}
- req.data[0] = isp1760_udc_read(udc, DC_DATAPORT);
- req.data[1] = isp1760_udc_read(udc, DC_DATAPORT);
+ req.data[0] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
+ req.data[1] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
if (udc->ep0_state != ISP1760_CTRL_SETUP) {
spin_unlock(&udc->lock);
@@ -732,13 +795,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
switch (usb_endpoint_type(desc)) {
case USB_ENDPOINT_XFER_ISOC:
- type = DC_ENDPTYP_ISOC;
+ type = ISP176x_DC_ENDPTYP_ISOC;
break;
case USB_ENDPOINT_XFER_BULK:
- type = DC_ENDPTYP_BULK;
+ type = ISP176x_DC_ENDPTYP_BULK;
break;
case USB_ENDPOINT_XFER_INT:
- type = DC_ENDPTYP_INTERRUPT;
+ type = ISP176x_DC_ENDPTYP_INTERRUPT;
break;
case USB_ENDPOINT_XFER_CONTROL:
default:
@@ -755,10 +818,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
uep->halted = false;
uep->wedged = false;
- isp1760_udc_select_ep(uep);
- isp1760_udc_write(udc, DC_EPMAXPKTSZ, uep->maxpacket);
+ isp1760_udc_select_ep(udc, uep);
+
+ isp1760_udc_write(udc, DC_FFOSZ, uep->maxpacket);
isp1760_udc_write(udc, DC_BUFLEN, uep->maxpacket);
- isp1760_udc_write(udc, DC_EPTYPE, DC_EPENABLE | type);
+
+ isp1760_udc_write(udc, DC_ENDPTYP, type);
+ isp1760_udc_set(udc, DC_EPENABLE);
spin_unlock_irqrestore(&udc->lock, flags);
@@ -786,8 +852,9 @@ static int isp1760_ep_disable(struct usb_ep *ep)
uep->desc = NULL;
uep->maxpacket = 0;
- isp1760_udc_select_ep(uep);
- isp1760_udc_write(udc, DC_EPTYPE, 0);
+ isp1760_udc_select_ep(udc, uep);
+ isp1760_udc_clear(udc, DC_EPENABLE);
+ isp1760_udc_clear(udc, DC_ENDPTYP);
/* TODO Synchronize with the IRQ handler */
@@ -864,8 +931,8 @@ static int isp1760_ep_queue(struct usb_ep *ep, struct usb_request *_req,
case ISP1760_CTRL_DATA_OUT:
list_add_tail(&req->queue, &uep->queue);
- __isp1760_udc_select_ep(uep, USB_DIR_OUT);
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
+ __isp1760_udc_select_ep(udc, uep, USB_DIR_OUT);
+ isp1760_udc_set(udc, DC_DSEN);
break;
case ISP1760_CTRL_STATUS:
@@ -1025,14 +1092,14 @@ static void isp1760_ep_fifo_flush(struct usb_ep *ep)
spin_lock_irqsave(&udc->lock, flags);
- isp1760_udc_select_ep(uep);
+ isp1760_udc_select_ep(udc, uep);
/*
* Set the CLBUF bit twice to flush both buffers in case double
* buffering is enabled.
*/
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
- isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
+ isp1760_udc_set(udc, DC_CLBUF);
+ isp1760_udc_set(udc, DC_CLBUF);
spin_unlock_irqrestore(&udc->lock, flags);
}
@@ -1091,19 +1158,30 @@ static void isp1760_udc_init_hw(struct isp1760_udc *udc)
* ACK tokens only (and NYET for the out pipe). The default
* configuration also generates an interrupt on the first NACK token.
*/
- isp1760_udc_write(udc, DC_INTCONF, DC_CDBGMOD_ACK | DC_DDBGMODIN_ACK |
- DC_DDBGMODOUT_ACK_NYET);
-
- isp1760_udc_write(udc, DC_INTENABLE, DC_IEPRXTX(7) | DC_IEPRXTX(6) |
- DC_IEPRXTX(5) | DC_IEPRXTX(4) | DC_IEPRXTX(3) |
- DC_IEPRXTX(2) | DC_IEPRXTX(1) | DC_IEPRXTX(0) |
- DC_IEP0SETUP | DC_IEVBUS | DC_IERESM | DC_IESUSP |
- DC_IEHS_STA | DC_IEBRST);
+ isp1760_udc_set(udc, DC_CDBGMOD_ACK);
+ isp1760_udc_set(udc, DC_DDBGMODIN_ACK);
+ isp1760_udc_set(udc, DC_DDBGMODOUT_ACK);
+
+ isp1760_udc_set(udc, DC_IEPRXTX_7);
+ isp1760_udc_set(udc, DC_IEPRXTX_6);
+ isp1760_udc_set(udc, DC_IEPRXTX_5);
+ isp1760_udc_set(udc, DC_IEPRXTX_4);
+ isp1760_udc_set(udc, DC_IEPRXTX_3);
+ isp1760_udc_set(udc, DC_IEPRXTX_2);
+ isp1760_udc_set(udc, DC_IEPRXTX_1);
+ isp1760_udc_set(udc, DC_IEPRXTX_0);
+
+ isp1760_udc_set(udc, DC_IEP0SETUP);
+ isp1760_udc_set(udc, DC_IEVBUS);
+ isp1760_udc_set(udc, DC_IERESM);
+ isp1760_udc_set(udc, DC_IESUSP);
+ isp1760_udc_set(udc, DC_IEHS_STA);
+ isp1760_udc_set(udc, DC_IEBRST);
if (udc->connected)
isp1760_set_pullup(udc->isp, true);
- isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN);
+ isp1760_udc_set(udc, DC_DEVEN);
}
static void isp1760_udc_reset(struct isp1760_udc *udc)
@@ -1152,7 +1230,7 @@ static int isp1760_udc_get_frame(struct usb_gadget *gadget)
{
struct isp1760_udc *udc = gadget_to_udc(gadget);
- return isp1760_udc_read(udc, DC_FRAMENUM) & ((1 << 11) - 1);
+ return isp1760_udc_read(udc, DC_FRAMENUM);
}
static int isp1760_udc_wakeup(struct usb_gadget *gadget)
@@ -1219,7 +1297,7 @@ static int isp1760_udc_start(struct usb_gadget *gadget,
usb_gadget_set_state(&udc->gadget, USB_STATE_ATTACHED);
/* DMA isn't supported yet, don't enable the DMA clock. */
- isp1760_udc_write(udc, DC_MODE, DC_GLINTENA);
+ isp1760_udc_set(udc, DC_GLINTENA);
isp1760_udc_init_hw(udc);
@@ -1238,7 +1316,7 @@ static int isp1760_udc_stop(struct usb_gadget *gadget)
del_timer_sync(&udc->vbus_timer);
- isp1760_udc_write(udc, DC_MODE, 0);
+ isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
spin_lock_irqsave(&udc->lock, flags);
udc->driver = NULL;
@@ -1266,9 +1344,9 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
unsigned int i;
u32 status;
- status = isp1760_udc_read(udc, DC_INTERRUPT)
- & isp1760_udc_read(udc, DC_INTENABLE);
- isp1760_udc_write(udc, DC_INTERRUPT, status);
+ status = isp1760_reg_read(udc->regs, ISP176x_DC_INTERRUPT)
+ & isp1760_reg_read(udc->regs, ISP176x_DC_INTENABLE);
+ isp1760_reg_write(udc->regs, ISP176x_DC_INTERRUPT, status);
if (status & DC_IEVBUS) {
dev_dbg(udc->isp->dev, "%s(VBUS)\n", __func__);
@@ -1313,7 +1391,7 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
dev_dbg(udc->isp->dev, "%s(SUSP)\n", __func__);
spin_lock(&udc->lock);
- if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
+ if (!isp1760_udc_is_set(udc, DC_VBUSSTAT))
isp1760_udc_disconnect(udc);
else
isp1760_udc_suspend(udc);
@@ -1335,7 +1413,7 @@ static void isp1760_udc_vbus_poll(struct timer_list *t)
spin_lock_irqsave(&udc->lock, flags);
- if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
+ if (!(isp1760_udc_is_set(udc, DC_VBUSSTAT)))
isp1760_udc_disconnect(udc);
else if (udc->gadget.state >= USB_STATE_POWERED)
mod_timer(&udc->vbus_timer,
@@ -1412,9 +1490,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
* register, and reading the scratch register value back. The chip ID
* and scratch register contents must match the expected values.
*/
- isp1760_udc_write(udc, DC_SCRATCH, 0xbabe);
- chipid = isp1760_udc_read(udc, DC_CHIPID);
- scratch = isp1760_udc_read(udc, DC_SCRATCH);
+ isp1760_reg_write(udc->regs, ISP176x_DC_SCRATCH, 0xbabe);
+ chipid = isp1760_reg_read(udc->regs, ISP176x_DC_CHIPID);
+ scratch = isp1760_reg_read(udc->regs, ISP176x_DC_SCRATCH);
if (scratch != 0xbabe) {
dev_err(udc->isp->dev,
@@ -1429,9 +1507,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
}
/* Reset the device controller. */
- isp1760_udc_write(udc, DC_MODE, DC_SFRESET);
+ isp1760_udc_set(udc, DC_SFRESET);
usleep_range(10000, 11000);
- isp1760_udc_write(udc, DC_MODE, 0);
+ isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
usleep_range(10000, 11000);
return 0;
@@ -1445,7 +1523,6 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq,
udc->irq = -1;
udc->isp = isp;
- udc->regs = isp->regs;
spin_lock_init(&udc->lock);
timer_setup(&udc->vbus_timer, isp1760_udc_vbus_poll, 0);
diff --git a/drivers/usb/isp1760/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
index d2df650d54e9..a49096c0ac8e 100644
--- a/drivers/usb/isp1760/isp1760-udc.h
+++ b/drivers/usb/isp1760/isp1760-udc.h
@@ -17,6 +17,8 @@
#include <linux/timer.h>
#include <linux/usb/gadget.h>
+#include "isp1760-regs.h"
+
struct isp1760_device;
struct isp1760_udc;
@@ -48,7 +50,7 @@ struct isp1760_ep {
* struct isp1760_udc - UDC state information
* irq: IRQ number
* irqname: IRQ name (as passed to request_irq)
- * regs: Base address of the UDC registers
+ * regs: regmap for UDC registers
* driver: Gadget driver
* gadget: Gadget device
* lock: Protects driver, vbus_timer, ep, ep0_*, DC_EPINDEX register
@@ -59,12 +61,13 @@ struct isp1760_ep {
* connected: Tracks gadget driver bus connection state
*/
struct isp1760_udc {
-#ifdef CONFIG_USB_ISP1761_UDC
struct isp1760_device *isp;
int irq;
char *irqname;
- void __iomem *regs;
+
+ struct regmap *regs;
+ struct regmap_field *fields[DC_FIELD_MAX];
struct usb_gadget_driver *driver;
struct usb_gadget gadget;
@@ -81,7 +84,6 @@ struct isp1760_udc {
bool connected;
unsigned int devstatus;
-#endif
};
#ifdef CONFIG_USB_ISP1761_UDC
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 1/7] usb: isp1760: move to regmap for register access
2021-05-04 10:19 ` [PATCH 1/7] usb: isp1760: move to regmap for register access Rui Miguel Silva
@ 2021-05-06 12:24 ` Laurent Pinchart
2021-05-06 13:39 ` Rui Miguel Silva
0 siblings, 1 reply; 25+ messages in thread
From: Laurent Pinchart @ 2021-05-06 12:24 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: Greg Kroah-Hartman, Sebastian Siewior, Rob Herring, linux-usb,
devicetree
Hi Rui,
Thank you for the patch.
On Tue, May 04, 2021 at 11:19:04AM +0100, Rui Miguel Silva wrote:
> Rework access to registers and memory to use regmap framework.
> No change in current feature or way of work is intended with this
> change.
>
> This will allow to reuse this driver with other IP of this family,
> for example isp1763, with little changes and effort.
>
> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
> ---
> drivers/usb/isp1760/isp1760-core.c | 123 +++++---
> drivers/usb/isp1760/isp1760-core.h | 38 ++-
> drivers/usb/isp1760/isp1760-hcd.c | 436 ++++++++++++++--------------
> drivers/usb/isp1760/isp1760-hcd.h | 18 +-
> drivers/usb/isp1760/isp1760-if.c | 4 +-
> drivers/usb/isp1760/isp1760-regs.h | 442 +++++++++++++++++------------
> drivers/usb/isp1760/isp1760-udc.c | 235 +++++++++------
> drivers/usb/isp1760/isp1760-udc.h | 10 +-
> 8 files changed, 779 insertions(+), 527 deletions(-)
>
> diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
> index fdeb4cf97cc5..f78e637d3b9a 100644
> --- a/drivers/usb/isp1760/isp1760-core.c
> +++ b/drivers/usb/isp1760/isp1760-core.c
> @@ -25,8 +25,8 @@
>
> static void isp1760_init_core(struct isp1760_device *isp)
> {
> - u32 otgctrl;
> - u32 hwmode;
> + struct isp1760_hcd *hcd = &isp->hcd;
> + struct isp1760_udc *udc = &isp->udc;
>
> /* Low-level chip reset */
> if (isp->rst_gpio) {
> @@ -39,24 +39,22 @@ static void isp1760_init_core(struct isp1760_device *isp)
> * Reset the host controller, including the CPU interface
> * configuration.
> */
> - isp1760_write32(isp->regs, HC_RESET_REG, SW_RESET_RESET_ALL);
> + isp1760_field_set(hcd->fields, SW_RESET_RESET_ALL);
> msleep(100);
>
> /* Setup HW Mode Control: This assumes a level active-low interrupt */
> - hwmode = HW_DATA_BUS_32BIT;
> -
> if (isp->devflags & ISP1760_FLAG_BUS_WIDTH_16)
> - hwmode &= ~HW_DATA_BUS_32BIT;
> + isp1760_field_clear(hcd->fields, HW_DATA_BUS_WIDTH);
> if (isp->devflags & ISP1760_FLAG_ANALOG_OC)
> - hwmode |= HW_ANA_DIGI_OC;
> + isp1760_field_set(hcd->fields, HW_ANA_DIGI_OC);
> if (isp->devflags & ISP1760_FLAG_DACK_POL_HIGH)
> - hwmode |= HW_DACK_POL_HIGH;
> + isp1760_field_set(hcd->fields, HW_DACK_POL_HIGH);
> if (isp->devflags & ISP1760_FLAG_DREQ_POL_HIGH)
> - hwmode |= HW_DREQ_POL_HIGH;
> + isp1760_field_set(hcd->fields, HW_DREQ_POL_HIGH);
> if (isp->devflags & ISP1760_FLAG_INTR_POL_HIGH)
> - hwmode |= HW_INTR_HIGH_ACT;
> + isp1760_field_set(hcd->fields, HW_INTR_HIGH_ACT);
> if (isp->devflags & ISP1760_FLAG_INTR_EDGE_TRIG)
> - hwmode |= HW_INTR_EDGE_TRIG;
> + isp1760_field_set(hcd->fields, HW_INTR_EDGE_TRIG);
This makes a difference, as you're now writing the register for every
bit. It can have a performance impact (although that should be small,
but still), but also a functional impact. I'd rather keep a single write
for this kind of sequence, especially when no read-modify-write sequence
is needed. If you need read-modify-write for the platform you work on,
switching to such patterns should be done in a patch of its own.
>
> /*
> * The ISP1761 has a dedicated DC IRQ line but supports sharing the HC
> @@ -65,18 +63,10 @@ static void isp1760_init_core(struct isp1760_device *isp)
> * spurious interrupts during HCD registration.
> */
> if (isp->devflags & ISP1760_FLAG_ISP1761) {
> - isp1760_write32(isp->regs, DC_MODE, 0);
> - hwmode |= HW_COMN_IRQ;
> + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> + isp1760_field_set(hcd->fields, HW_COMN_IRQ);
> }
>
> - /*
> - * We have to set this first in case we're in 16-bit mode.
> - * Write it twice to ensure correct upper bits if switching
> - * to 16-bit mode.
> - */
> - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> -
> /*
> * PORT 1 Control register of the ISP1760 is the OTG control register
> * on ISP1761.
> @@ -85,14 +75,15 @@ static void isp1760_init_core(struct isp1760_device *isp)
> * when OTG is requested.
> */
> if ((isp->devflags & ISP1760_FLAG_ISP1761) &&
> - (isp->devflags & ISP1760_FLAG_OTG_EN))
> - otgctrl = ((HW_DM_PULLDOWN | HW_DP_PULLDOWN) << 16)
> - | HW_OTG_DISABLE;
> - else
> - otgctrl = (HW_SW_SEL_HC_DC << 16)
> - | (HW_VBUS_DRV | HW_SEL_CP_EXT);
> -
> - isp1760_write32(isp->regs, HC_PORT1_CTRL, otgctrl);
> + (isp->devflags & ISP1760_FLAG_OTG_EN)) {
> + isp1760_field_set(hcd->fields, HW_DM_PULLDOWN);
> + isp1760_field_set(hcd->fields, HW_DP_PULLDOWN);
> + isp1760_field_set(hcd->fields, HW_OTG_DISABLE);
> + } else {
> + isp1760_field_set(hcd->fields, HW_SW_SEL_HC_DC);
> + isp1760_field_set(hcd->fields, HW_VBUS_DRV);
> + isp1760_field_set(hcd->fields, HW_SEL_CP_EXT);
> + }
>
> dev_info(isp->dev, "bus width: %u, oc: %s\n",
> isp->devflags & ISP1760_FLAG_BUS_WIDTH_16 ? 16 : 32,
> @@ -101,16 +92,43 @@ static void isp1760_init_core(struct isp1760_device *isp)
>
> void isp1760_set_pullup(struct isp1760_device *isp, bool enable)
> {
> - isp1760_write32(isp->regs, HW_OTG_CTRL_SET,
> - enable ? HW_DP_PULLUP : HW_DP_PULLUP << 16);
> + struct isp1760_udc *udc = &isp->udc;
> +
> + if (enable)
> + isp1760_field_set(udc->fields, HW_DP_PULLUP);
> + else
> + isp1760_field_set(udc->fields, HW_DP_PULLUP_CLEAR);
> }
>
> +static struct regmap_config isp1760_hc_regmap_conf = {
> + .name = "isp1760-hc",
> + .reg_bits = 16,
> + .val_bits = 32,
> + .fast_io = true,
> + .max_register = ISP176x_HC_MEMORY,
> + .volatile_table = &isp176x_hc_volatile_table,
> +};
> +
> +static struct regmap_config isp1761_dc_regmap_conf = {
> + .name = "isp1761-dc",
> + .reg_bits = 16,
> + .val_bits = 32,
> + .fast_io = true,
> + .max_register = ISP1761_DC_OTG_CTRL_CLEAR,
> + .volatile_table = &isp176x_dc_volatile_table,
> +};
> +
> int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> struct device *dev, unsigned int devflags)
> {
> struct isp1760_device *isp;
> + struct isp1760_hcd *hcd;
> + struct isp1760_udc *udc;
> bool udc_disabled = !(devflags & ISP1760_FLAG_ISP1761);
> + struct regmap_field *f;
> + void __iomem *base;
> int ret;
> + int i;
>
> /*
> * If neither the HCD not the UDC is enabled return an error, as no
> @@ -126,19 +144,52 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
>
> isp->dev = dev;
> isp->devflags = devflags;
> + hcd = &isp->hcd;
> + udc = &isp->udc;
> +
> + if (devflags & ISP1760_FLAG_BUS_WIDTH_16) {
> + isp1760_hc_regmap_conf.val_bits = 16;
> + isp1761_dc_regmap_conf.val_bits = 16;
> + }
>
> isp->rst_gpio = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);
> if (IS_ERR(isp->rst_gpio))
> return PTR_ERR(isp->rst_gpio);
>
> - isp->regs = devm_ioremap_resource(dev, mem);
> - if (IS_ERR(isp->regs))
> - return PTR_ERR(isp->regs);
> + hcd->base = devm_ioremap_resource(dev, mem);
> + if (IS_ERR(hcd->base))
> + return PTR_ERR(hcd->base);
> +
> + hcd->regs = devm_regmap_init_mmio(dev, base, &isp1760_hc_regmap_conf);
> + if (IS_ERR(hcd->regs))
> + return PTR_ERR(hcd->regs);
> +
> + for (i = 0; i < HC_FIELD_MAX; i++) {
> + f = devm_regmap_field_alloc(dev, hcd->regs,
> + isp1760_hc_reg_fields[i]);
> + if (IS_ERR(f))
> + return PTR_ERR(f);
> +
> + hcd->fields[i] = f;
> + }
> +
> + udc->regs = devm_regmap_init_mmio(dev, base, &isp1761_dc_regmap_conf);
> + if (IS_ERR(udc->regs))
> + return PTR_ERR(udc->regs);
> +
> + for (i = 0; i < DC_FIELD_MAX; i++) {
> + f = devm_regmap_field_alloc(dev, udc->regs,
> + isp1761_dc_reg_fields[i]);
> + if (IS_ERR(f))
> + return PTR_ERR(f);
> +
> + udc->fields[i] = f;
> + }
>
> isp1760_init_core(isp);
>
> if (IS_ENABLED(CONFIG_USB_ISP1760_HCD) && !usb_disabled()) {
> - ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq,
> + ret = isp1760_hcd_register(hcd, mem, irq,
> irqflags | IRQF_SHARED, dev);
> if (ret < 0)
> return ret;
> @@ -147,7 +198,7 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> if (IS_ENABLED(CONFIG_USB_ISP1761_UDC) && !udc_disabled) {
> ret = isp1760_udc_register(isp, irq, irqflags);
> if (ret < 0) {
> - isp1760_hcd_unregister(&isp->hcd);
> + isp1760_hcd_unregister(hcd);
> return ret;
> }
> }
> diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
> index d9a0a4cc467c..8fec6395f19f 100644
> --- a/drivers/usb/isp1760/isp1760-core.h
> +++ b/drivers/usb/isp1760/isp1760-core.h
> @@ -14,6 +14,7 @@
> #define _ISP1760_CORE_H_
>
> #include <linux/ioport.h>
> +#include <linux/regmap.h>
>
> #include "isp1760-hcd.h"
> #include "isp1760-udc.h"
> @@ -38,7 +39,6 @@ struct gpio_desc;
> struct isp1760_device {
> struct device *dev;
>
> - void __iomem *regs;
> unsigned int devflags;
> struct gpio_desc *rst_gpio;
>
> @@ -52,14 +52,42 @@ void isp1760_unregister(struct device *dev);
>
> void isp1760_set_pullup(struct isp1760_device *isp, bool enable);
>
> -static inline u32 isp1760_read32(void __iomem *base, u32 reg)
> +static inline u32 isp1760_field_read(struct regmap_field **fields, u32 field)
> {
> - return readl(base + reg);
> + unsigned int val;
> +
> + regmap_field_read(fields[field], &val);
> +
> + return val;
> +}
> +
> +static inline void isp1760_field_write(struct regmap_field **fields, u32 field,
> + u32 val)
> +{
> + regmap_field_write(fields[field], val);
> +}
> +
> +static inline void isp1760_field_set(struct regmap_field **fields, u32 field)
> +{
> + isp1760_field_write(fields, field, 0xFFFFFFFF);
> }
>
> -static inline void isp1760_write32(void __iomem *base, u32 reg, u32 val)
> +static inline void isp1760_field_clear(struct regmap_field **fields, u32 field)
> {
> - writel(val, base + reg);
> + isp1760_field_write(fields, field, 0);
> }
>
> +static inline u32 isp1760_reg_read(struct regmap *regs, u32 reg)
> +{
> + unsigned int val;
> +
> + regmap_read(regs, reg, &val);
> +
> + return val;
> +}
> +
> +static inline void isp1760_reg_write(struct regmap *regs, u32 reg, u32 val)
> +{
> + regmap_write(regs, reg, val);
> +}
> #endif
> diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
> index 33ae656c4b68..0601b1a4bd42 100644
> --- a/drivers/usb/isp1760/isp1760-hcd.c
> +++ b/drivers/usb/isp1760/isp1760-hcd.c
> @@ -66,6 +66,10 @@ struct ptd {
> #define ATL_PTD_OFFSET 0x0c00
> #define PAYLOAD_OFFSET 0x1000
>
> +#define ISP_BANK_0 0x00
> +#define ISP_BANK_1 0x01
> +#define ISP_BANK_2 0x02
> +#define ISP_BANK_3 0x03
>
> /* ATL */
> /* DW0 */
> @@ -159,16 +163,59 @@ struct urb_listitem {
> };
>
> /*
> - * Access functions for isp176x registers (addresses 0..0x03FF).
> + * Access functions for isp176x registers regmap fields
> */
> -static u32 reg_read32(void __iomem *base, u32 reg)
> +static u32 isp1760_hcd_read(struct usb_hcd *hcd, u32 field)
> {
> - return isp1760_read32(base, reg);
> + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> +
> + return isp1760_field_read(priv->fields, field);
> +}
> +
> +static void isp1760_hcd_write(struct usb_hcd *hcd, u32 field, u32 val)
> +{
> + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> +
> + isp1760_field_write(priv->fields, field, val);
> +}
> +
> +static void isp1760_hcd_set(struct usb_hcd *hcd, u32 field)
> +{
> + isp1760_hcd_write(hcd, field, 0xFFFFFFFF);
> +}
> +
> +static void isp1760_hcd_clear(struct usb_hcd *hcd, u32 field)
> +{
> + isp1760_hcd_write(hcd, field, 0);
> +}
> +
> +static int isp1760_hcd_set_poll_timeout(struct usb_hcd *hcd, u32 field,
> + u32 timeout_us)
> +{
> + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> + unsigned int val;
> +
> + isp1760_hcd_set(hcd, field);
> +
> + return regmap_field_read_poll_timeout(priv->fields[field], val, 1, 1,
> + timeout_us);
> }
>
> -static void reg_write32(void __iomem *base, u32 reg, u32 val)
> +static int isp1760_hcd_clear_poll_timeout(struct usb_hcd *hcd, u32 field,
> + u32 timeout_us)
> {
> - isp1760_write32(base, reg, val);
> + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> + unsigned int val;
> +
> + isp1760_hcd_clear(hcd, field);
> +
> + return regmap_field_read_poll_timeout(priv->fields[field], val, 0, 1,
> + timeout_us);
> +}
> +
> +static bool isp1760_hcd_is_set(struct usb_hcd *hcd, u32 field)
> +{
> + return !!isp1760_hcd_read(hcd, field);
> }
>
> /*
> @@ -231,12 +278,15 @@ static void bank_reads8(void __iomem *src_base, u32 src_offset, u32 bank_addr,
> }
> }
>
> -static void mem_reads8(void __iomem *src_base, u32 src_offset, void *dst,
> - u32 bytes)
> +static void mem_reads8(struct usb_hcd *hcd, void __iomem *src_base,
> + u32 src_offset, void *dst, u32 bytes)
> {
> - reg_write32(src_base, HC_MEMORY_REG, src_offset + ISP_BANK(0));
> + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> + isp1760_hcd_write(hcd, MEM_START_ADDR, src_offset);
> +
> ndelay(90);
> - bank_reads8(src_base, src_offset, ISP_BANK(0), dst, bytes);
> +
> + bank_reads8(src_base, src_offset, ISP_BANK_0, dst, bytes);
> }
>
> static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> @@ -278,14 +328,15 @@ static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> * Read and write ptds. 'ptd_offset' should be one of ISO_PTD_OFFSET,
> * INT_PTD_OFFSET, and ATL_PTD_OFFSET. 'slot' should be less than 32.
> */
> -static void ptd_read(void __iomem *base, u32 ptd_offset, u32 slot,
> - struct ptd *ptd)
> +static void ptd_read(struct usb_hcd *hcd, void __iomem *base,
> + u32 ptd_offset, u32 slot, struct ptd *ptd)
> {
> - reg_write32(base, HC_MEMORY_REG,
> - ISP_BANK(0) + ptd_offset + slot*sizeof(*ptd));
> + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> + isp1760_hcd_write(hcd, MEM_START_ADDR,
> + ptd_offset + slot * sizeof(*ptd));
> ndelay(90);
> - bank_reads8(base, ptd_offset + slot*sizeof(*ptd), ISP_BANK(0),
> - (void *) ptd, sizeof(*ptd));
> + bank_reads8(base, ptd_offset + slot * sizeof(*ptd), ISP_BANK_0,
> + (void *)ptd, sizeof(*ptd));
> }
>
> static void ptd_write(void __iomem *base, u32 ptd_offset, u32 slot,
> @@ -377,34 +428,15 @@ static void free_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
> qtd->payload_addr = 0;
> }
>
> -static int handshake(struct usb_hcd *hcd, u32 reg,
> - u32 mask, u32 done, int usec)
> -{
> - u32 result;
> - int ret;
> -
> - ret = readl_poll_timeout_atomic(hcd->regs + reg, result,
> - ((result & mask) == done ||
> - result == U32_MAX), 1, usec);
> - if (result == U32_MAX)
> - return -ENODEV;
> -
> - return ret;
> -}
> -
> /* reset a non-running (STS_HALT == 1) controller */
> static int ehci_reset(struct usb_hcd *hcd)
> {
> struct isp1760_hcd *priv = hcd_to_priv(hcd);
>
> - u32 command = reg_read32(hcd->regs, HC_USBCMD);
> -
> - command |= CMD_RESET;
> - reg_write32(hcd->regs, HC_USBCMD, command);
> hcd->state = HC_STATE_HALT;
> priv->next_statechange = jiffies;
>
> - return handshake(hcd, HC_USBCMD, CMD_RESET, 0, 250 * 1000);
> + return isp1760_hcd_set_poll_timeout(hcd, CMD_RESET, 250 * 1000);
> }
>
> static struct isp1760_qh *qh_alloc(gfp_t flags)
> @@ -432,8 +464,10 @@ static void qh_free(struct isp1760_qh *qh)
> /* one-time init, only for memory state */
> static int priv_init(struct usb_hcd *hcd)
> {
> - struct isp1760_hcd *priv = hcd_to_priv(hcd);
> - u32 hcc_params;
> + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> + u32 isoc_cache;
> + u32 isoc_thres;
> +
> int i;
>
> spin_lock_init(&priv->lock);
> @@ -448,12 +482,14 @@ static int priv_init(struct usb_hcd *hcd)
> priv->periodic_size = DEFAULT_I_TDPS;
>
> /* controllers may cache some of the periodic schedule ... */
> - hcc_params = reg_read32(hcd->regs, HC_HCCPARAMS);
> + isoc_cache = isp1760_hcd_read(hcd->regs, HCC_ISOC_CACHE);
> + isoc_thres = isp1760_hcd_read(hcd->regs, HCC_ISOC_THRES);
> +
> /* full frame cache */
> - if (HCC_ISOC_CACHE(hcc_params))
> + if (isoc_cache)
> priv->i_thresh = 8;
> else /* N microframes cached */
> - priv->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
> + priv->i_thresh = 2 + isoc_thres;
>
> return 0;
> }
> @@ -462,12 +498,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> {
> struct isp1760_hcd *priv = hcd_to_priv(hcd);
> int result;
> - u32 scratch, hwmode;
> + u32 scratch;
> +
> + isp1760_reg_write(priv->regs, ISP176x_HC_SCRATCH, 0xdeadbabe);
>
> - reg_write32(hcd->regs, HC_SCRATCH_REG, 0xdeadbabe);
> /* Change bus pattern */
> - scratch = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> - scratch = reg_read32(hcd->regs, HC_SCRATCH_REG);
> + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_SCRATCH);
> if (scratch != 0xdeadbabe) {
> dev_err(hcd->self.controller, "Scratch test failed.\n");
> return -ENODEV;
> @@ -481,10 +518,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> * the host controller through the EHCI USB Command register. The device
> * has been reset in core code anyway, so this shouldn't matter.
> */
> - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG, 0);
> - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> + isp1760_reg_write(priv->regs, ISP176x_HC_BUFFER_STATUS, 0);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> + NO_TRANSFER_ACTIVE);
> + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> + NO_TRANSFER_ACTIVE);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP,
> + NO_TRANSFER_ACTIVE);
>
> result = ehci_reset(hcd);
> if (result)
> @@ -493,14 +533,11 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> /* Step 11 passed */
>
> /* ATL reset */
> - hwmode = reg_read32(hcd->regs, HC_HW_MODE_CTRL) & ~ALL_ATX_RESET;
> - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode | ALL_ATX_RESET);
> + isp1760_hcd_set(hcd, ALL_ATX_RESET);
> mdelay(10);
> - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode);
> -
> - reg_write32(hcd->regs, HC_INTERRUPT_ENABLE, INTERRUPT_ENABLE_MASK);
> + isp1760_hcd_clear(hcd, ALL_ATX_RESET);
>
> - priv->hcs_params = reg_read32(hcd->regs, HC_HCSPARAMS);
> + isp1760_hcd_set(hcd, HC_INT_ENABLE);
>
> return priv_init(hcd);
> }
> @@ -730,12 +767,12 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
>
> /* Make sure done map has not triggered from some unlinked transfer */
> if (ptd_offset == ATL_PTD_OFFSET) {
> - priv->atl_done_map |= reg_read32(hcd->regs,
> - HC_ATL_PTD_DONEMAP_REG);
> + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> + ISP176x_HC_ATL_PTD_DONEMAP);
> priv->atl_done_map &= ~(1 << slot);
> } else {
> - priv->int_done_map |= reg_read32(hcd->regs,
> - HC_INT_PTD_DONEMAP_REG);
> + priv->int_done_map |= isp1760_reg_read(priv->regs,
> + ISP176x_HC_INT_PTD_DONEMAP);
> priv->int_done_map &= ~(1 << slot);
> }
>
> @@ -744,16 +781,20 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
> slots[slot].timestamp = jiffies;
> slots[slot].qtd = qtd;
> slots[slot].qh = qh;
> - ptd_write(hcd->regs, ptd_offset, slot, ptd);
> + ptd_write(priv->base, ptd_offset, slot, ptd);
>
> if (ptd_offset == ATL_PTD_OFFSET) {
> - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> + skip_map = isp1760_reg_read(priv->regs,
> + ISP176x_HC_ATL_PTD_SKIPMAP);
> skip_map &= ~(1 << qh->slot);
> - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> + skip_map);
> } else {
> - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> + skip_map = isp1760_reg_read(priv->regs,
> + ISP176x_HC_INT_PTD_SKIPMAP);
> skip_map &= ~(1 << qh->slot);
> - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> + skip_map);
> }
> }
>
> @@ -766,9 +807,10 @@ static int is_short_bulk(struct isp1760_qtd *qtd)
> static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> struct list_head *urb_list)
> {
> - int last_qtd;
> + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> struct isp1760_qtd *qtd, *qtd_next;
> struct urb_listitem *urb_listitem;
> + int last_qtd;
>
> list_for_each_entry_safe(qtd, qtd_next, &qh->qtd_list, qtd_list) {
> if (qtd->status < QTD_XFER_COMPLETE)
> @@ -783,9 +825,10 @@ static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> if (qtd->actual_length) {
> switch (qtd->packet_type) {
> case IN_PID:
> - mem_reads8(hcd->regs, qtd->payload_addr,
> - qtd->data_buffer,
> - qtd->actual_length);
> + mem_reads8(hcd, priv->base,
> + qtd->payload_addr,
> + qtd->data_buffer,
> + qtd->actual_length);
> fallthrough;
> case OUT_PID:
> qtd->urb->actual_length +=
> @@ -873,8 +916,8 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
> if ((qtd->length) &&
> ((qtd->packet_type == SETUP_PID) ||
> (qtd->packet_type == OUT_PID))) {
> - mem_writes8(hcd->regs, qtd->payload_addr,
> - qtd->data_buffer, qtd->length);
> + mem_writes8(priv->base, qtd->payload_addr,
> + qtd->data_buffer, qtd->length);
> }
>
> qtd->status = QTD_PAYLOAD_ALLOC;
> @@ -1074,9 +1117,9 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> int modified;
> int skip_map;
>
> - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP);
> priv->int_done_map &= ~skip_map;
> - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP);
> priv->atl_done_map &= ~skip_map;
>
> modified = priv->int_done_map || priv->atl_done_map;
> @@ -1094,7 +1137,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> continue;
> }
> ptd_offset = INT_PTD_OFFSET;
> - ptd_read(hcd->regs, INT_PTD_OFFSET, slot, &ptd);
> + ptd_read(hcd, priv->base, INT_PTD_OFFSET, slot, &ptd);
> state = check_int_transfer(hcd, &ptd,
> slots[slot].qtd->urb);
> } else {
> @@ -1109,7 +1152,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> continue;
> }
> ptd_offset = ATL_PTD_OFFSET;
> - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> state = check_atl_transfer(hcd, &ptd,
> slots[slot].qtd->urb);
> }
> @@ -1134,7 +1177,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
>
> qtd->status = QTD_XFER_COMPLETE;
> if (list_is_last(&qtd->qtd_list, &qh->qtd_list) ||
> - is_short_bulk(qtd))
> + is_short_bulk(qtd))
> qtd = NULL;
> else
> qtd = list_entry(qtd->qtd_list.next,
> @@ -1210,13 +1253,15 @@ static irqreturn_t isp1760_irq(struct usb_hcd *hcd)
> if (!(hcd->state & HC_STATE_RUNNING))
> goto leave;
>
> - imask = reg_read32(hcd->regs, HC_INTERRUPT_REG);
> + imask = isp1760_reg_read(priv->regs, ISP176x_HC_INTERRUPT);
> if (unlikely(!imask))
> goto leave;
> - reg_write32(hcd->regs, HC_INTERRUPT_REG, imask); /* Clear */
> + isp1760_reg_write(priv->regs, ISP176x_HC_INTERRUPT, imask); /* Clear */
>
> - priv->int_done_map |= reg_read32(hcd->regs, HC_INT_PTD_DONEMAP_REG);
> - priv->atl_done_map |= reg_read32(hcd->regs, HC_ATL_PTD_DONEMAP_REG);
> + priv->int_done_map |= isp1760_reg_read(priv->regs,
> + ISP176x_HC_INT_PTD_DONEMAP);
> + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> + ISP176x_HC_ATL_PTD_DONEMAP);
>
> handle_done_ptds(hcd);
>
> @@ -1271,7 +1316,7 @@ static void errata2_function(struct timer_list *unused)
> if (priv->atl_slots[slot].qh && time_after(jiffies,
> priv->atl_slots[slot].timestamp +
> msecs_to_jiffies(SLOT_TIMEOUT))) {
> - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> if (!FROM_DW0_VALID(ptd.dw0) &&
> !FROM_DW3_ACTIVE(ptd.dw3))
> priv->atl_done_map |= 1 << slot;
> @@ -1288,9 +1333,8 @@ static void errata2_function(struct timer_list *unused)
>
> static int isp1760_run(struct usb_hcd *hcd)
> {
> + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> int retval;
> - u32 temp;
> - u32 command;
> u32 chipid;
>
> hcd->uses_new_polling = 1;
> @@ -1298,23 +1342,20 @@ static int isp1760_run(struct usb_hcd *hcd)
> hcd->state = HC_STATE_RUNNING;
>
> /* Set PTD interrupt AND & OR maps */
> - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_AND_REG, 0);
> - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_OR_REG, 0xffffffff);
> - reg_write32(hcd->regs, HC_INT_IRQ_MASK_AND_REG, 0);
> - reg_write32(hcd->regs, HC_INT_IRQ_MASK_OR_REG, 0xffffffff);
> - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_AND_REG, 0);
> - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_OR_REG, 0xffffffff);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_AND, 0);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_OR, 0xffffffff);
> + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_AND, 0);
> + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_OR, 0xffffffff);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_AND, 0);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_OR, 0xffffffff);
> /* step 23 passed */
>
> - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp | HW_GLOBAL_INTR_EN);
> + isp1760_hcd_set(hcd, HW_GLOBAL_INTR_EN);
>
> - command = reg_read32(hcd->regs, HC_USBCMD);
> - command &= ~(CMD_LRESET|CMD_RESET);
> - command |= CMD_RUN;
> - reg_write32(hcd->regs, HC_USBCMD, command);
> + isp1760_hcd_clear(hcd, CMD_LRESET);
> + isp1760_hcd_clear(hcd, CMD_RESET);
>
> - retval = handshake(hcd, HC_USBCMD, CMD_RUN, CMD_RUN, 250 * 1000);
> + retval = isp1760_hcd_set_poll_timeout(hcd, CMD_RUN, 250 * 1000);
> if (retval)
> return retval;
>
> @@ -1324,9 +1365,8 @@ static int isp1760_run(struct usb_hcd *hcd)
> * the semaphore while doing so.
> */
> down_write(&ehci_cf_port_reset_rwsem);
> - reg_write32(hcd->regs, HC_CONFIGFLAG, FLAG_CF);
>
> - retval = handshake(hcd, HC_CONFIGFLAG, FLAG_CF, FLAG_CF, 250 * 1000);
> + retval = isp1760_hcd_set_poll_timeout(hcd, FLAG_CF, 250 * 1000);
> up_write(&ehci_cf_port_reset_rwsem);
> if (retval)
> return retval;
> @@ -1336,21 +1376,22 @@ static int isp1760_run(struct usb_hcd *hcd)
> errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
> add_timer(&errata2_timer);
>
> - chipid = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> + chipid = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> dev_info(hcd->self.controller, "USB ISP %04x HW rev. %d started\n",
> chipid & 0xffff, chipid >> 16);
>
> /* PTD Register Init Part 2, Step 28 */
>
> /* Setup registers controlling PTD checking */
> - reg_write32(hcd->regs, HC_ATL_PTD_LASTPTD_REG, 0x80000000);
> - reg_write32(hcd->regs, HC_INT_PTD_LASTPTD_REG, 0x80000000);
> - reg_write32(hcd->regs, HC_ISO_PTD_LASTPTD_REG, 0x00000001);
> - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, 0xffffffff);
> - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, 0xffffffff);
> - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, 0xffffffff);
> - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG,
> - ATL_BUF_FILL | INT_BUF_FILL);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_LASTPTD, 0x80000000);
> + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_LASTPTD, 0x80000000);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_LASTPTD, 0x00000001);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP, 0xffffffff);
> + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP, 0xffffffff);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP, 0xffffffff);
> +
> + isp1760_hcd_set(hcd, ATL_BUF_FILL);
> + isp1760_hcd_set(hcd, INT_BUF_FILL);
>
> /* GRR this is run-once init(), being done every time the HC starts.
> * So long as they're part of class devices, we can't do it init()
> @@ -1584,15 +1625,19 @@ static void kill_transfer(struct usb_hcd *hcd, struct urb *urb,
> /* We need to forcefully reclaim the slot since some transfers never
> return, e.g. interrupt transfers and NAKed bulk transfers. */
> if (usb_pipecontrol(urb->pipe) || usb_pipebulk(urb->pipe)) {
> - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> + skip_map = isp1760_reg_read(priv->regs,
> + ISP176x_HC_ATL_PTD_SKIPMAP);
> skip_map |= (1 << qh->slot);
> - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> + skip_map);
> priv->atl_slots[qh->slot].qh = NULL;
> priv->atl_slots[qh->slot].qtd = NULL;
> } else {
> - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> + skip_map = isp1760_reg_read(priv->regs,
> + ISP176x_HC_INT_PTD_SKIPMAP);
> skip_map |= (1 << qh->slot);
> - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> + skip_map);
> priv->int_slots[qh->slot].qh = NULL;
> priv->int_slots[qh->slot].qtd = NULL;
> }
> @@ -1705,8 +1750,7 @@ static void isp1760_endpoint_disable(struct usb_hcd *hcd,
> static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> {
> struct isp1760_hcd *priv = hcd_to_priv(hcd);
> - u32 temp, status = 0;
> - u32 mask;
> + u32 status = 0;
> int retval = 1;
> unsigned long flags;
>
> @@ -1716,17 +1760,13 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
>
> /* init status to no-changes */
> buf[0] = 0;
> - mask = PORT_CSC;
>
> spin_lock_irqsave(&priv->lock, flags);
> - temp = reg_read32(hcd->regs, HC_PORTSC1);
>
> - if (temp & PORT_OWNER) {
> - if (temp & PORT_CSC) {
> - temp &= ~PORT_CSC;
> - reg_write32(hcd->regs, HC_PORTSC1, temp);
> - goto done;
> - }
> + if (isp1760_hcd_is_set(hcd, PORT_OWNER) &&
> + isp1760_hcd_is_set(hcd, PORT_CSC)) {
> + isp1760_hcd_clear(hcd, PORT_CSC);
> + goto done;
> }
>
> /*
> @@ -1735,11 +1775,9 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> * high-speed device is switched over to the companion
> * controller by the user.
> */
> -
> - if ((temp & mask) != 0
> - || ((temp & PORT_RESUME) != 0
> - && time_after_eq(jiffies,
> - priv->reset_done))) {
> + if (isp1760_hcd_is_set(hcd, PORT_CSC) ||
> + (isp1760_hcd_is_set(hcd, PORT_RESUME) &&
> + time_after_eq(jiffies, priv->reset_done))) {
> buf [0] |= 1 << (0 + 1);
> status = STS_PCD;
> }
> @@ -1752,9 +1790,11 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> struct usb_hub_descriptor *desc)
> {
> - int ports = HCS_N_PORTS(priv->hcs_params);
> + int ports;
> u16 temp;
>
> + ports = isp1760_hcd_read(priv->hcd, HCS_N_PORTS);
> +
> desc->bDescriptorType = USB_DT_HUB;
> /* priv 1.0, 2.3.9 says 20ms max */
> desc->bPwrOn2PwrGood = 10;
> @@ -1770,7 +1810,7 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
>
> /* per-port overcurrent reporting */
> temp = HUB_CHAR_INDV_PORT_OCPM;
> - if (HCS_PPC(priv->hcs_params))
> + if (isp1760_hcd_is_set(priv->hcd, HCS_PPC))
> /* per-port power control */
> temp |= HUB_CHAR_INDV_PORT_LPSM;
> else
> @@ -1781,38 +1821,37 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
>
> #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)
>
> -static int check_reset_complete(struct usb_hcd *hcd, int index,
> - int port_status)
> +static void check_reset_complete(struct usb_hcd *hcd, int index)
> {
> - if (!(port_status & PORT_CONNECT))
> - return port_status;
> + if (!(isp1760_hcd_is_set(hcd, PORT_CONNECT)))
> + return;
>
> /* if reset finished and it's still not enabled -- handoff */
> - if (!(port_status & PORT_PE)) {
> -
> + if (!isp1760_hcd_is_set(hcd, PORT_PE)) {
> dev_info(hcd->self.controller,
> "port %d full speed --> companion\n",
> index + 1);
>
> - port_status |= PORT_OWNER;
> - port_status &= ~PORT_RWC_BITS;
> - reg_write32(hcd->regs, HC_PORTSC1, port_status);
> + isp1760_hcd_set(hcd, PORT_OWNER);
>
> + isp1760_hcd_clear(hcd, PORT_CSC);
> } else
> dev_info(hcd->self.controller, "port %d high speed\n",
> index + 1);
>
> - return port_status;
> + return;
> }
>
> static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> u16 wValue, u16 wIndex, char *buf, u16 wLength)
> {
> struct isp1760_hcd *priv = hcd_to_priv(hcd);
> - int ports = HCS_N_PORTS(priv->hcs_params);
> - u32 temp, status;
> + u32 status;
> unsigned long flags;
> int retval = 0;
> + int ports;
> +
> + ports = isp1760_hcd_read(hcd, HCS_N_PORTS);
>
> /*
> * FIXME: support SetPortFeatures USB_PORT_FEAT_INDICATOR.
> @@ -1837,7 +1876,6 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> if (!wIndex || wIndex > ports)
> goto error;
> wIndex--;
> - temp = reg_read32(hcd->regs, HC_PORTSC1);
>
> /*
> * Even if OWNER is set, so the port is owned by the
> @@ -1848,22 +1886,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
>
> switch (wValue) {
> case USB_PORT_FEAT_ENABLE:
> - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_PE);
> + isp1760_hcd_clear(hcd, PORT_PE);
> break;
> case USB_PORT_FEAT_C_ENABLE:
> /* XXX error? */
> break;
> case USB_PORT_FEAT_SUSPEND:
> - if (temp & PORT_RESET)
> + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> goto error;
>
> - if (temp & PORT_SUSPEND) {
> - if ((temp & PORT_PE) == 0)
> + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND)) {
> + if (!isp1760_hcd_is_set(hcd, PORT_PE))
> goto error;
> /* resume signaling for 20 msec */
> - temp &= ~(PORT_RWC_BITS);
> - reg_write32(hcd->regs, HC_PORTSC1,
> - temp | PORT_RESUME);
> + isp1760_hcd_clear(hcd, PORT_CSC);
> + isp1760_hcd_set(hcd, PORT_RESUME);
> +
> priv->reset_done = jiffies +
> msecs_to_jiffies(USB_RESUME_TIMEOUT);
> }
> @@ -1872,12 +1910,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> /* we auto-clear this feature */
> break;
> case USB_PORT_FEAT_POWER:
> - if (HCS_PPC(priv->hcs_params))
> - reg_write32(hcd->regs, HC_PORTSC1,
> - temp & ~PORT_POWER);
> + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> + isp1760_hcd_clear(hcd, PORT_POWER);
> break;
> case USB_PORT_FEAT_C_CONNECTION:
> - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_CSC);
> + isp1760_hcd_set(hcd, PORT_CSC);
> break;
> case USB_PORT_FEAT_C_OVER_CURRENT:
> /* XXX error ?*/
> @@ -1888,7 +1925,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> default:
> goto error;
> }
> - reg_read32(hcd->regs, HC_USBCMD);
> + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> break;
> case GetHubDescriptor:
> isp1760_hub_descriptor(priv, (struct usb_hub_descriptor *)
> @@ -1903,15 +1940,14 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> goto error;
> wIndex--;
> status = 0;
> - temp = reg_read32(hcd->regs, HC_PORTSC1);
>
> /* wPortChange bits */
> - if (temp & PORT_CSC)
> + if (isp1760_hcd_is_set(hcd, PORT_CSC))
> status |= USB_PORT_STAT_C_CONNECTION << 16;
>
>
> /* whoever resumes must GetPortStatus to complete it!! */
> - if (temp & PORT_RESUME) {
> + if (isp1760_hcd_is_set(hcd, PORT_RESUME)) {
> dev_err(hcd->self.controller, "Port resume should be skipped.\n");
>
> /* Remote Wakeup received? */
> @@ -1930,35 +1966,31 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> priv->reset_done = 0;
>
> /* stop resume signaling */
> - temp = reg_read32(hcd->regs, HC_PORTSC1);
> - reg_write32(hcd->regs, HC_PORTSC1,
> - temp & ~(PORT_RWC_BITS | PORT_RESUME));
> - retval = handshake(hcd, HC_PORTSC1,
> - PORT_RESUME, 0, 2000 /* 2msec */);
> + isp1760_hcd_clear(hcd, PORT_CSC);
> +
> + retval = isp1760_hcd_clear_poll_timeout(hcd,
> + PORT_RESUME, 2000);
> if (retval != 0) {
> dev_err(hcd->self.controller,
> "port %d resume error %d\n",
> wIndex + 1, retval);
> goto error;
> }
> - temp &= ~(PORT_SUSPEND|PORT_RESUME|(3<<10));
> }
> }
>
> /* whoever resets must GetPortStatus to complete it!! */
> - if ((temp & PORT_RESET)
> - && time_after_eq(jiffies,
> - priv->reset_done)) {
> + if (isp1760_hcd_is_set(hcd, PORT_RESET) &&
> + time_after_eq(jiffies, priv->reset_done)) {
> status |= USB_PORT_STAT_C_RESET << 16;
> priv->reset_done = 0;
>
> /* force reset to complete */
> - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_RESET);
> /* REVISIT: some hardware needs 550+ usec to clear
> * this bit; seems too long to spin routinely...
> */
> - retval = handshake(hcd, HC_PORTSC1,
> - PORT_RESET, 0, 750);
> + retval = isp1760_hcd_clear_poll_timeout(hcd, PORT_RESET,
> + 750);
> if (retval != 0) {
> dev_err(hcd->self.controller, "port %d reset error %d\n",
> wIndex + 1, retval);
> @@ -1966,8 +1998,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> }
>
> /* see what we found out */
> - temp = check_reset_complete(hcd, wIndex,
> - reg_read32(hcd->regs, HC_PORTSC1));
> + check_reset_complete(hcd, wIndex);
> }
> /*
> * Even if OWNER is set, there's no harm letting hub_wq
> @@ -1975,21 +2006,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> * for PORT_POWER anyway).
> */
>
> - if (temp & PORT_OWNER)
> + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> dev_err(hcd->self.controller, "PORT_OWNER is set\n");
>
> - if (temp & PORT_CONNECT) {
> + if (isp1760_hcd_is_set(hcd, PORT_CONNECT)) {
> status |= USB_PORT_STAT_CONNECTION;
> /* status may be from integrated TT */
> status |= USB_PORT_STAT_HIGH_SPEED;
> }
> - if (temp & PORT_PE)
> + if (isp1760_hcd_is_set(hcd, PORT_PE))
> status |= USB_PORT_STAT_ENABLE;
> - if (temp & (PORT_SUSPEND|PORT_RESUME))
> + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND) &&
> + isp1760_hcd_is_set(hcd, PORT_RESUME))
> status |= USB_PORT_STAT_SUSPEND;
> - if (temp & PORT_RESET)
> + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> status |= USB_PORT_STAT_RESET;
> - if (temp & PORT_POWER)
> + if (isp1760_hcd_is_set(hcd, PORT_POWER))
> status |= USB_PORT_STAT_POWER;
>
> put_unaligned(cpu_to_le32(status), (__le32 *) buf);
> @@ -2009,41 +2041,39 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> if (!wIndex || wIndex > ports)
> goto error;
> wIndex--;
> - temp = reg_read32(hcd->regs, HC_PORTSC1);
> - if (temp & PORT_OWNER)
> + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> break;
>
> -/* temp &= ~PORT_RWC_BITS; */
> switch (wValue) {
> case USB_PORT_FEAT_ENABLE:
> - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_PE);
> + isp1760_hcd_set(hcd, PORT_PE);
> break;
>
> case USB_PORT_FEAT_SUSPEND:
> - if ((temp & PORT_PE) == 0
> - || (temp & PORT_RESET) != 0)
> + if (!isp1760_hcd_is_set(hcd, PORT_PE) ||
> + isp1760_hcd_is_set(hcd, PORT_RESET))
> goto error;
>
> - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_SUSPEND);
> + isp1760_hcd_set(hcd, PORT_SUSPEND);
> break;
> case USB_PORT_FEAT_POWER:
> - if (HCS_PPC(priv->hcs_params))
> - reg_write32(hcd->regs, HC_PORTSC1,
> - temp | PORT_POWER);
> + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> + isp1760_hcd_set(hcd, PORT_POWER);
> break;
> case USB_PORT_FEAT_RESET:
> - if (temp & PORT_RESUME)
> + if (isp1760_hcd_is_set(hcd, PORT_RESUME))
> goto error;
> /* line status bits may report this as low speed,
> * which can be fine if this root hub has a
> * transaction translator built in.
> */
> - if ((temp & (PORT_PE|PORT_CONNECT)) == PORT_CONNECT
> - && PORT_USB11(temp)) {
> - temp |= PORT_OWNER;
> + if ((isp1760_hcd_is_set(hcd, PORT_CONNECT) &&
> + !isp1760_hcd_is_set(hcd, PORT_PE)) &&
> + (isp1760_hcd_read(hcd, PORT_LSTATUS) == 1)) {
> + isp1760_hcd_set(hcd, PORT_OWNER);
> } else {
> - temp |= PORT_RESET;
> - temp &= ~PORT_PE;
> + isp1760_hcd_set(hcd, PORT_RESET);
> + isp1760_hcd_clear(hcd, PORT_PE);
>
> /*
> * caller must wait, then call GetPortStatus
> @@ -2052,12 +2082,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> priv->reset_done = jiffies +
> msecs_to_jiffies(50);
> }
> - reg_write32(hcd->regs, HC_PORTSC1, temp);
> break;
> default:
> goto error;
> }
> - reg_read32(hcd->regs, HC_USBCMD);
> + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> break;
>
> default:
> @@ -2074,14 +2103,13 @@ static int isp1760_get_frame(struct usb_hcd *hcd)
> struct isp1760_hcd *priv = hcd_to_priv(hcd);
> u32 fr;
>
> - fr = reg_read32(hcd->regs, HC_FRINDEX);
> + fr = isp1760_hcd_read(hcd, HC_FRINDEX);
> return (fr >> 3) % priv->periodic_size;
> }
>
> static void isp1760_stop(struct usb_hcd *hcd)
> {
> struct isp1760_hcd *priv = hcd_to_priv(hcd);
> - u32 temp;
>
> del_timer(&errata2_timer);
>
> @@ -2092,24 +2120,19 @@ static void isp1760_stop(struct usb_hcd *hcd)
> spin_lock_irq(&priv->lock);
> ehci_reset(hcd);
> /* Disable IRQ */
> - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
> + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> spin_unlock_irq(&priv->lock);
>
> - reg_write32(hcd->regs, HC_CONFIGFLAG, 0);
> + isp1760_hcd_clear(hcd, FLAG_CF);
> }
>
> static void isp1760_shutdown(struct usb_hcd *hcd)
> {
> - u32 command, temp;
> -
> isp1760_stop(hcd);
> - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
>
> - command = reg_read32(hcd->regs, HC_USBCMD);
> - command &= ~CMD_RUN;
> - reg_write32(hcd->regs, HC_USBCMD, command);
> + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> +
> + isp1760_hcd_clear(hcd, CMD_RUN);
> }
>
> static void isp1760_clear_tt_buffer_complete(struct usb_hcd *hcd,
> @@ -2182,8 +2205,8 @@ void isp1760_deinit_kmem_cache(void)
> kmem_cache_destroy(urb_listitem_cachep);
> }
>
> -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> - struct resource *mem, int irq, unsigned long irqflags,
> +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> + int irq, unsigned long irqflags,
> struct device *dev)
> {
> struct usb_hcd *hcd;
> @@ -2200,7 +2223,6 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> init_memory(priv);
>
> hcd->irq = irq;
> - hcd->regs = regs;
> hcd->rsrc_start = mem->start;
> hcd->rsrc_len = resource_size(mem);
>
> diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
> index f1bb2deb1ccf..34e1899e52c4 100644
> --- a/drivers/usb/isp1760/isp1760-hcd.h
> +++ b/drivers/usb/isp1760/isp1760-hcd.h
> @@ -3,6 +3,9 @@
> #define _ISP1760_HCD_H_
>
> #include <linux/spinlock.h>
> +#include <linux/regmap.h>
> +
> +#include "isp1760-regs.h"
>
> struct isp1760_qh;
> struct isp1760_qtd;
> @@ -48,10 +51,13 @@ enum isp1760_queue_head_types {
> };
>
> struct isp1760_hcd {
> -#ifdef CONFIG_USB_ISP1760_HCD
> struct usb_hcd *hcd;
>
> - u32 hcs_params;
> + void __iomem *base;
> +
> + struct regmap *regs;
> + struct regmap_field *fields[HC_FIELD_MAX];
> +
> spinlock_t lock;
> struct isp1760_slotinfo atl_slots[32];
> int atl_done_map;
> @@ -66,20 +72,18 @@ struct isp1760_hcd {
> unsigned i_thresh;
> unsigned long reset_done;
> unsigned long next_statechange;
> -#endif
> };
>
> #ifdef CONFIG_USB_ISP1760_HCD
> -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> - struct resource *mem, int irq, unsigned long irqflags,
> - struct device *dev);
> +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> + int irq, unsigned long irqflags, struct device *dev);
> void isp1760_hcd_unregister(struct isp1760_hcd *priv);
>
> int isp1760_init_kmem_once(void);
> void isp1760_deinit_kmem_cache(void);
> #else
> static inline int isp1760_hcd_register(struct isp1760_hcd *priv,
> - void __iomem *regs, struct resource *mem,
> + struct resource *mem,
> int irq, unsigned long irqflags,
> struct device *dev)
> {
> diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
> index ccd30f835888..abfba9f5ec23 100644
> --- a/drivers/usb/isp1760/isp1760-if.c
> +++ b/drivers/usb/isp1760/isp1760-if.c
> @@ -75,9 +75,9 @@ static int isp1761_pci_init(struct pci_dev *dev)
> /*by default host is in 16bit mode, so
> * io operations at this stage must be 16 bit
> * */
> - writel(0xface, iobase + HC_SCRATCH_REG);
> + writel(0xface, iobase + ISP176x_HC_SCRATCH);
> udelay(100);
> - reg_data = readl(iobase + HC_SCRATCH_REG) & 0x0000ffff;
> + reg_data = readl(iobase + ISP176x_HC_SCRATCH) & 0x0000ffff;
> retry_count--;
> }
>
> diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
> index fedc4f5cded0..42ee4404c90b 100644
> --- a/drivers/usb/isp1760/isp1760-regs.h
> +++ b/drivers/usb/isp1760/isp1760-regs.h
> @@ -10,218 +10,286 @@
> * Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> */
>
> -#ifndef _ISP1760_REGS_H_
> -#define _ISP1760_REGS_H_
> +#ifndef _ISP176x_REGS_H_
> +#define _ISP176x_REGS_H_
> +
> +#include <linux/regmap.h>
>
> /* -----------------------------------------------------------------------------
> * Host Controller
> */
>
> /* EHCI capability registers */
> -#define HC_CAPLENGTH 0x000
> -#define HC_LENGTH(p) (((p) >> 00) & 0x00ff) /* bits 7:0 */
> -#define HC_VERSION(p) (((p) >> 16) & 0xffff) /* bits 31:16 */
> -
> -#define HC_HCSPARAMS 0x004
> -#define HCS_INDICATOR(p) ((p) & (1 << 16)) /* true: has port indicators */
> -#define HCS_PPC(p) ((p) & (1 << 4)) /* true: port power control */
> -#define HCS_N_PORTS(p) (((p) >> 0) & 0xf) /* bits 3:0, ports on HC */
> -
> -#define HC_HCCPARAMS 0x008
> -#define HCC_ISOC_CACHE(p) ((p) & (1 << 7)) /* true: can cache isoc frame */
> -#define HCC_ISOC_THRES(p) (((p) >> 4) & 0x7) /* bits 6:4, uframes cached */
> +#define ISP176x_HC_CAPLENGTH 0x000
> +#define ISP176x_HC_VERSION 0x002
> +#define ISP176x_HC_HCSPARAMS 0x004
> +#define ISP176x_HC_HCCPARAMS 0x008
>
> /* EHCI operational registers */
> -#define HC_USBCMD 0x020
> -#define CMD_LRESET (1 << 7) /* partial reset (no ports, etc) */
> -#define CMD_RESET (1 << 1) /* reset HC not bus */
> -#define CMD_RUN (1 << 0) /* start/stop HC */
> -
> -#define HC_USBSTS 0x024
> -#define STS_PCD (1 << 2) /* port change detect */
> -
> -#define HC_FRINDEX 0x02c
> -
> -#define HC_CONFIGFLAG 0x060
> -#define FLAG_CF (1 << 0) /* true: we'll support "high speed" */
> -
> -#define HC_PORTSC1 0x064
> -#define PORT_OWNER (1 << 13) /* true: companion hc owns this port */
> -#define PORT_POWER (1 << 12) /* true: has power (see PPC) */
> -#define PORT_USB11(x) (((x) & (3 << 10)) == (1 << 10)) /* USB 1.1 device */
> -#define PORT_RESET (1 << 8) /* reset port */
> -#define PORT_SUSPEND (1 << 7) /* suspend port */
> -#define PORT_RESUME (1 << 6) /* resume it */
> -#define PORT_PE (1 << 2) /* port enable */
> -#define PORT_CSC (1 << 1) /* connect status change */
> -#define PORT_CONNECT (1 << 0) /* device connected */
> -#define PORT_RWC_BITS (PORT_CSC)
> -
> -#define HC_ISO_PTD_DONEMAP_REG 0x130
> -#define HC_ISO_PTD_SKIPMAP_REG 0x134
> -#define HC_ISO_PTD_LASTPTD_REG 0x138
> -#define HC_INT_PTD_DONEMAP_REG 0x140
> -#define HC_INT_PTD_SKIPMAP_REG 0x144
> -#define HC_INT_PTD_LASTPTD_REG 0x148
> -#define HC_ATL_PTD_DONEMAP_REG 0x150
> -#define HC_ATL_PTD_SKIPMAP_REG 0x154
> -#define HC_ATL_PTD_LASTPTD_REG 0x158
> +#define ISP176x_HC_USBCMD 0x020
> +#define ISP176x_HC_USBSTS 0x024
> +#define ISP176x_HC_FRINDEX 0x02c
> +
> +#define ISP176x_HC_CONFIGFLAG 0x060
> +#define ISP176x_HC_PORTSC1 0x064
> +
> +#define ISP176x_HC_ISO_PTD_DONEMAP 0x130
> +#define ISP176x_HC_ISO_PTD_SKIPMAP 0x134
> +#define ISP176x_HC_ISO_PTD_LASTPTD 0x138
> +#define ISP176x_HC_INT_PTD_DONEMAP 0x140
> +#define ISP176x_HC_INT_PTD_SKIPMAP 0x144
> +#define ISP176x_HC_INT_PTD_LASTPTD 0x148
> +#define ISP176x_HC_ATL_PTD_DONEMAP 0x150
> +#define ISP176x_HC_ATL_PTD_SKIPMAP 0x154
> +#define ISP176x_HC_ATL_PTD_LASTPTD 0x158
>
> /* Configuration Register */
> -#define HC_HW_MODE_CTRL 0x300
> -#define ALL_ATX_RESET (1 << 31)
> -#define HW_ANA_DIGI_OC (1 << 15)
> -#define HW_DEV_DMA (1 << 11)
> -#define HW_COMN_IRQ (1 << 10)
> -#define HW_COMN_DMA (1 << 9)
> -#define HW_DATA_BUS_32BIT (1 << 8)
> -#define HW_DACK_POL_HIGH (1 << 6)
> -#define HW_DREQ_POL_HIGH (1 << 5)
> -#define HW_INTR_HIGH_ACT (1 << 2)
> -#define HW_INTR_EDGE_TRIG (1 << 1)
> -#define HW_GLOBAL_INTR_EN (1 << 0)
> -
> -#define HC_CHIP_ID_REG 0x304
> -#define HC_SCRATCH_REG 0x308
> -
> -#define HC_RESET_REG 0x30c
> -#define SW_RESET_RESET_HC (1 << 1)
> -#define SW_RESET_RESET_ALL (1 << 0)
> -
> -#define HC_BUFFER_STATUS_REG 0x334
> -#define ISO_BUF_FILL (1 << 2)
> -#define INT_BUF_FILL (1 << 1)
> -#define ATL_BUF_FILL (1 << 0)
> -
> -#define HC_MEMORY_REG 0x33c
> -#define ISP_BANK(x) ((x) << 16)
> -
> -#define HC_PORT1_CTRL 0x374
> -#define PORT1_POWER (3 << 3)
> -#define PORT1_INIT1 (1 << 7)
> -#define PORT1_INIT2 (1 << 23)
> -#define HW_OTG_CTRL_SET 0x374
> -#define HW_OTG_CTRL_CLR 0x376
> -#define HW_OTG_DISABLE (1 << 10)
> -#define HW_OTG_SE0_EN (1 << 9)
> -#define HW_BDIS_ACON_EN (1 << 8)
> -#define HW_SW_SEL_HC_DC (1 << 7)
> -#define HW_VBUS_CHRG (1 << 6)
> -#define HW_VBUS_DISCHRG (1 << 5)
> -#define HW_VBUS_DRV (1 << 4)
> -#define HW_SEL_CP_EXT (1 << 3)
> -#define HW_DM_PULLDOWN (1 << 2)
> -#define HW_DP_PULLDOWN (1 << 1)
> -#define HW_DP_PULLUP (1 << 0)
> +#define ISP176x_HC_HW_MODE_CTRL 0x300
> +#define ISP176x_HC_CHIP_ID 0x304
> +#define ISP176x_HC_SCRATCH 0x308
> +#define ISP176x_HC_RESET 0x30c
> +#define ISP176x_HC_BUFFER_STATUS 0x334
> +#define ISP176x_HC_MEMORY 0x33c
>
> /* Interrupt Register */
> -#define HC_INTERRUPT_REG 0x310
> -
> -#define HC_INTERRUPT_ENABLE 0x314
> -#define HC_ISO_INT (1 << 9)
> -#define HC_ATL_INT (1 << 8)
> -#define HC_INTL_INT (1 << 7)
> -#define HC_EOT_INT (1 << 3)
> -#define HC_SOT_INT (1 << 1)
> -#define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT)
> -
> -#define HC_ISO_IRQ_MASK_OR_REG 0x318
> -#define HC_INT_IRQ_MASK_OR_REG 0x31c
> -#define HC_ATL_IRQ_MASK_OR_REG 0x320
> -#define HC_ISO_IRQ_MASK_AND_REG 0x324
> -#define HC_INT_IRQ_MASK_AND_REG 0x328
> -#define HC_ATL_IRQ_MASK_AND_REG 0x32c
> +#define ISP176x_HC_INTERRUPT 0x310
> +#define ISP176x_HC_INTERRUPT_ENABLE 0x314
> +#define ISP176x_HC_ISO_IRQ_MASK_OR 0x318
> +#define ISP176x_HC_INT_IRQ_MASK_OR 0x31c
> +#define ISP176x_HC_ATL_IRQ_MASK_OR 0x320
> +#define ISP176x_HC_ISO_IRQ_MASK_AND 0x324
> +#define ISP176x_HC_INT_IRQ_MASK_AND 0x328
> +#define ISP176x_HC_ATL_IRQ_MASK_AND 0x32c
> +
> +static const struct regmap_range isp176x_hc_volatile_ranges[] = {
> + regmap_reg_range(ISP176x_HC_USBCMD, ISP176x_HC_ATL_PTD_LASTPTD),
> + regmap_reg_range(ISP176x_HC_BUFFER_STATUS, ISP176x_HC_MEMORY),
> + regmap_reg_range(ISP176x_HC_INTERRUPT, ISP176x_HC_ATL_IRQ_MASK_AND),
> +};
> +
> +static const struct regmap_access_table isp176x_hc_volatile_table = {
> + .yes_ranges = isp176x_hc_volatile_ranges,
> + .n_yes_ranges = ARRAY_SIZE(isp176x_hc_volatile_ranges),
> +};
These belong to a .c file.
> +
> +enum isp176x_host_controller_fields {
> + /* HC_HCSPARAMS */
> + HCS_PPC, HCS_N_PORTS,
> + /* HC_HCCPARAMS */
> + HCC_ISOC_CACHE, HCC_ISOC_THRES,
> + /* HC_USBCMD */
> + CMD_LRESET, CMD_RESET, CMD_RUN,
> + /* HC_USBSTS */
> + STS_PCD,
> + /* HC_FRINDEX */
> + HC_FRINDEX,
> + /* HC_CONFIGFLAG */
> + FLAG_CF,
> + /* HC_PORTSC1 */
> + PORT_OWNER, PORT_POWER, PORT_LSTATUS, PORT_RESET, PORT_SUSPEND,
> + PORT_RESUME, PORT_PE, PORT_CSC, PORT_CONNECT,
> + /* HC_HW_MODE_CTRL */
> + ALL_ATX_RESET, HW_ANA_DIGI_OC, HW_DEV_DMA, HW_COMN_IRQ, HW_COMN_DMA,
> + HW_DATA_BUS_WIDTH, HW_DACK_POL_HIGH, HW_DREQ_POL_HIGH, HW_INTR_HIGH_ACT,
> + HW_INTR_EDGE_TRIG, HW_GLOBAL_INTR_EN,
> + /* HC_RESET */
> + SW_RESET_RESET_HC, SW_RESET_RESET_ALL,
> + /* HC_BUFFER_STATUS */
> + INT_BUF_FILL, ATL_BUF_FILL,
> + /* HC_MEMORY */
> + MEM_BANK_SEL, MEM_START_ADDR,
> + /* HC_INTERRUPT_ENABLE */
> + HC_INT_ENABLE,
> + /* Last element */
> + HC_FIELD_MAX,
> +};
> +
> +static const struct reg_field isp1760_hc_reg_fields[] = {
> + [HCS_PPC] = REG_FIELD(ISP176x_HC_HCSPARAMS, 4, 4),
> + [HCS_N_PORTS] = REG_FIELD(ISP176x_HC_HCSPARAMS, 0, 3),
> + [HCC_ISOC_CACHE] = REG_FIELD(ISP176x_HC_HCCPARAMS, 7, 7),
> + [HCC_ISOC_THRES] = REG_FIELD(ISP176x_HC_HCCPARAMS, 4, 6),
> + [CMD_LRESET] = REG_FIELD(ISP176x_HC_USBCMD, 7, 7),
> + [CMD_RESET] = REG_FIELD(ISP176x_HC_USBCMD, 1, 1),
> + [CMD_RUN] = REG_FIELD(ISP176x_HC_USBCMD, 0, 0),
> + [STS_PCD] = REG_FIELD(ISP176x_HC_USBSTS, 2, 2),
> + [HC_FRINDEX] = REG_FIELD(ISP176x_HC_FRINDEX, 0, 13),
> + [FLAG_CF] = REG_FIELD(ISP176x_HC_CONFIGFLAG, 0, 0),
> + [PORT_OWNER] = REG_FIELD(ISP176x_HC_PORTSC1, 13, 13),
> + [PORT_POWER] = REG_FIELD(ISP176x_HC_PORTSC1, 12, 12),
> + [PORT_LSTATUS] = REG_FIELD(ISP176x_HC_PORTSC1, 10, 11),
> + [PORT_RESET] = REG_FIELD(ISP176x_HC_PORTSC1, 8, 8),
> + [PORT_SUSPEND] = REG_FIELD(ISP176x_HC_PORTSC1, 7, 7),
> + [PORT_RESUME] = REG_FIELD(ISP176x_HC_PORTSC1, 6, 6),
> + [PORT_PE] = REG_FIELD(ISP176x_HC_PORTSC1, 2, 2),
> + [PORT_CSC] = REG_FIELD(ISP176x_HC_PORTSC1, 1, 1),
> + [PORT_CONNECT] = REG_FIELD(ISP176x_HC_PORTSC1, 0, 0),
> + [ALL_ATX_RESET] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 31, 31),
> + [HW_ANA_DIGI_OC] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 15, 15),
> + [HW_COMN_IRQ] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 10, 10),
> + [HW_DATA_BUS_WIDTH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 8, 8),
> + [HW_DACK_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 6, 6),
> + [HW_DREQ_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 5, 5),
> + [HW_INTR_HIGH_ACT] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 2, 2),
> + [HW_INTR_EDGE_TRIG] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 1, 1),
> + [HW_GLOBAL_INTR_EN] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 0, 0),
> + [SW_RESET_RESET_ALL] = REG_FIELD(ISP176x_HC_RESET, 0, 0),
> + [INT_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 1, 1),
> + [ATL_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 0, 0),
> + [MEM_BANK_SEL] = REG_FIELD(ISP176x_HC_MEMORY, 16, 17),
> + [MEM_START_ADDR] = REG_FIELD(ISP176x_HC_MEMORY, 0, 15),
> + [HC_INT_ENABLE] = REG_FIELD(ISP176x_HC_INTERRUPT_ENABLE, 7, 8),
> +};
This too.
>
> /* -----------------------------------------------------------------------------
> * Peripheral Controller
> */
>
> -/* Initialization Registers */
> -#define DC_ADDRESS 0x0200
> -#define DC_DEVEN (1 << 7)
> -
> -#define DC_MODE 0x020c
> -#define DC_DMACLKON (1 << 9)
> -#define DC_VBUSSTAT (1 << 8)
> -#define DC_CLKAON (1 << 7)
> -#define DC_SNDRSU (1 << 6)
> -#define DC_GOSUSP (1 << 5)
> -#define DC_SFRESET (1 << 4)
> -#define DC_GLINTENA (1 << 3)
> -#define DC_WKUPCS (1 << 2)
> -
> -#define DC_INTCONF 0x0210
> -#define DC_CDBGMOD_ACK_NAK (0 << 6)
> -#define DC_CDBGMOD_ACK (1 << 6)
> -#define DC_CDBGMOD_ACK_1NAK (2 << 6)
> -#define DC_DDBGMODIN_ACK_NAK (0 << 4)
> -#define DC_DDBGMODIN_ACK (1 << 4)
> -#define DC_DDBGMODIN_ACK_1NAK (2 << 4)
> -#define DC_DDBGMODOUT_ACK_NYET_NAK (0 << 2)
> -#define DC_DDBGMODOUT_ACK_NYET (1 << 2)
> -#define DC_DDBGMODOUT_ACK_NYET_1NAK (2 << 2)
> -#define DC_INTLVL (1 << 1)
> -#define DC_INTPOL (1 << 0)
> -
> -#define DC_DEBUG 0x0212
> -#define DC_INTENABLE 0x0214
> #define DC_IEPTX(n) (1 << (11 + 2 * (n)))
> #define DC_IEPRX(n) (1 << (10 + 2 * (n)))
> #define DC_IEPRXTX(n) (3 << (10 + 2 * (n)))
> -#define DC_IEP0SETUP (1 << 8)
> -#define DC_IEVBUS (1 << 7)
> -#define DC_IEDMA (1 << 6)
> -#define DC_IEHS_STA (1 << 5)
> -#define DC_IERESM (1 << 4)
> -#define DC_IESUSP (1 << 3)
> -#define DC_IEPSOF (1 << 2)
> -#define DC_IESOF (1 << 1)
> -#define DC_IEBRST (1 << 0)
> +
> +#define ISP176x_DC_ENDPTYP_ISOC 0x01
> +#define ISP176x_DC_ENDPTYP_BULK 0x02
> +#define ISP176x_DC_ENDPTYP_INTERRUPT 0x03
> +
> +/* Initialization Registers */
> +#define ISP176x_DC_ADDRESS 0x0200
> +#define ISP176x_DC_MODE 0x020c
> +#define ISP176x_DC_INTCONF 0x0210
> +#define ISP176x_DC_DEBUG 0x0212
> +#define ISP176x_DC_INTENABLE 0x0214
>
> /* Data Flow Registers */
> -#define DC_EPINDEX 0x022c
> -#define DC_EP0SETUP (1 << 5)
> -#define DC_ENDPIDX(n) ((n) << 1)
> -#define DC_EPDIR (1 << 0)
> -
> -#define DC_CTRLFUNC 0x0228
> -#define DC_CLBUF (1 << 4)
> -#define DC_VENDP (1 << 3)
> -#define DC_DSEN (1 << 2)
> -#define DC_STATUS (1 << 1)
> -#define DC_STALL (1 << 0)
> -
> -#define DC_DATAPORT 0x0220
> -#define DC_BUFLEN 0x021c
> -#define DC_DATACOUNT_MASK 0xffff
> -#define DC_BUFSTAT 0x021e
> -#define DC_EPMAXPKTSZ 0x0204
> -
> -#define DC_EPTYPE 0x0208
> -#define DC_NOEMPKT (1 << 4)
> -#define DC_EPENABLE (1 << 3)
> -#define DC_DBLBUF (1 << 2)
> -#define DC_ENDPTYP_ISOC (1 << 0)
> -#define DC_ENDPTYP_BULK (2 << 0)
> -#define DC_ENDPTYP_INTERRUPT (3 << 0)
> +#define ISP176x_DC_EPMAXPKTSZ 0x0204
> +#define ISP176x_DC_EPTYPE 0x0208
> +
> +#define ISP176x_DC_BUFLEN 0x021c
> +#define ISP176x_DC_BUFSTAT 0x021e
> +#define ISP176x_DC_DATAPORT 0x0220
> +
> +#define ISP176x_DC_CTRLFUNC 0x0228
> +#define ISP176x_DC_EPINDEX 0x022c
> +
> +#define ISP1761_DC_OTG_CTRL_SET 0x374
> +#define ISP1761_DC_OTG_CTRL_CLEAR 0x376
>
> /* DMA Registers */
> -#define DC_DMACMD 0x0230
> -#define DC_DMATXCOUNT 0x0234
> -#define DC_DMACONF 0x0238
> -#define DC_DMAHW 0x023c
> -#define DC_DMAINTREASON 0x0250
> -#define DC_DMAINTEN 0x0254
> -#define DC_DMAEP 0x0258
> -#define DC_DMABURSTCOUNT 0x0264
> +#define ISP176x_DC_DMACMD 0x0230
> +#define ISP176x_DC_DMATXCOUNT 0x0234
> +#define ISP176x_DC_DMACONF 0x0238
> +#define ISP176x_DC_DMAHW 0x023c
> +#define ISP176x_DC_DMAINTREASON 0x0250
> +#define ISP176x_DC_DMAINTEN 0x0254
> +#define ISP176x_DC_DMAEP 0x0258
> +#define ISP176x_DC_DMABURSTCOUNT 0x0264
>
> /* General Registers */
> -#define DC_INTERRUPT 0x0218
> -#define DC_CHIPID 0x0270
> -#define DC_FRAMENUM 0x0274
> -#define DC_SCRATCH 0x0278
> -#define DC_UNLOCKDEV 0x027c
> -#define DC_INTPULSEWIDTH 0x0280
> -#define DC_TESTMODE 0x0284
> +#define ISP176x_DC_INTERRUPT 0x0218
> +#define ISP176x_DC_CHIPID 0x0270
> +#define ISP176x_DC_FRAMENUM 0x0274
> +#define ISP176x_DC_SCRATCH 0x0278
> +#define ISP176x_DC_UNLOCKDEV 0x027c
> +#define ISP176x_DC_INTPULSEWIDTH 0x0280
> +#define ISP176x_DC_TESTMODE 0x0284
> +
> +static const struct regmap_range isp176x_dc_volatile_ranges[] = {
> + regmap_reg_range(ISP176x_DC_EPMAXPKTSZ, ISP176x_DC_EPTYPE),
> + regmap_reg_range(ISP176x_DC_BUFLEN, ISP176x_DC_EPINDEX),
> + regmap_reg_range(ISP1761_DC_OTG_CTRL_SET, ISP1761_DC_OTG_CTRL_CLEAR),
> +};
> +
> +static const struct regmap_access_table isp176x_dc_volatile_table = {
> + .yes_ranges = isp176x_dc_volatile_ranges,
> + .n_yes_ranges = ARRAY_SIZE(isp176x_dc_volatile_ranges),
> +};
> +
> +enum isp176x_device_controller_fields {
> + /* DC_ADDRESS */
> + DC_DEVEN, DC_DEVADDR,
> + /* DC_MODE */
> + DC_VBUSSTAT, DC_SFRESET, DC_GLINTENA,
> + /* DC_INTCONF */
> + DC_CDBGMOD_ACK, DC_DDBGMODIN_ACK, DC_DDBGMODOUT_ACK, DC_INTPOL,
> + /* DC_INTENABLE */
> + DC_IEPRXTX_7, DC_IEPRXTX_6, DC_IEPRXTX_5, DC_IEPRXTX_4, DC_IEPRXTX_3,
> + DC_IEPRXTX_2, DC_IEPRXTX_1, DC_IEPRXTX_0,
> + DC_IEP0SETUP, DC_IEVBUS, DC_IEHS_STA, DC_IERESM, DC_IESUSP, DC_IEBRST,
> + /* DC_EPINDEX */
> + DC_EP0SETUP, DC_ENDPIDX, DC_EPDIR,
> + /* DC_CTRLFUNC */
> + DC_CLBUF, DC_VENDP, DC_DSEN, DC_STATUS, DC_STALL,
> + /* DC_BUFLEN */
> + DC_BUFLEN,
> + /* DC_EPMAXPKTSZ */
> + DC_FFOSZ,
> + /* DC_EPTYPE */
> + DC_EPENABLE, DC_ENDPTYP,
> + /* DC_FRAMENUM */
> + DC_FRAMENUM, DC_UFRAMENUM,
> + /* HW_OTG_CTRL_SET */
> + HW_OTG_DISABLE, HW_SW_SEL_HC_DC, HW_VBUS_DRV, HW_SEL_CP_EXT,
> + HW_DM_PULLDOWN, HW_DP_PULLDOWN, HW_DP_PULLUP,
> + /* HW_OTG_CTRL_CLR */
> + HW_OTG_DISABLE_CLEAR, HW_SW_SEL_HC_DC_CLEAR, HW_VBUS_DRV_CLEAR,
> + HW_SEL_CP_EXT_CLEAR, HW_DM_PULLDOWN_CLEAR, HW_DP_PULLDOWN_CLEAR,
> + HW_DP_PULLUP_CLEAR,
> + /* Last element */
> + DC_FIELD_MAX,
> +};
> +
> +static const struct reg_field isp1761_dc_reg_fields[] = {
> + [DC_DEVEN] = REG_FIELD(ISP176x_DC_ADDRESS, 7, 7),
> + [DC_DEVADDR] = REG_FIELD(ISP176x_DC_ADDRESS, 0, 6),
> + [DC_VBUSSTAT] = REG_FIELD(ISP176x_DC_MODE, 8, 8),
> + [DC_SFRESET] = REG_FIELD(ISP176x_DC_MODE, 4, 4),
> + [DC_GLINTENA] = REG_FIELD(ISP176x_DC_MODE, 3, 3),
> + [DC_CDBGMOD_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 6, 6),
> + [DC_DDBGMODIN_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 4, 4),
> + [DC_DDBGMODOUT_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 2, 2),
> + [DC_INTPOL] = REG_FIELD(ISP176x_DC_INTCONF, 0, 0),
> + [DC_IEPRXTX_7] = REG_FIELD(ISP176x_DC_INTENABLE, 25, 25),
> + [DC_IEPRXTX_6] = REG_FIELD(ISP176x_DC_INTENABLE, 23, 23),
> + [DC_IEPRXTX_5] = REG_FIELD(ISP176x_DC_INTENABLE, 21, 21),
> + [DC_IEPRXTX_4] = REG_FIELD(ISP176x_DC_INTENABLE, 19, 19),
> + [DC_IEPRXTX_3] = REG_FIELD(ISP176x_DC_INTENABLE, 17, 17),
> + [DC_IEPRXTX_2] = REG_FIELD(ISP176x_DC_INTENABLE, 15, 15),
> + [DC_IEPRXTX_1] = REG_FIELD(ISP176x_DC_INTENABLE, 13, 13),
> + [DC_IEPRXTX_0] = REG_FIELD(ISP176x_DC_INTENABLE, 11, 11),
> + [DC_IEP0SETUP] = REG_FIELD(ISP176x_DC_INTENABLE, 8, 8),
> + [DC_IEVBUS] = REG_FIELD(ISP176x_DC_INTENABLE, 7, 7),
> + [DC_IEHS_STA] = REG_FIELD(ISP176x_DC_INTENABLE, 5, 5),
> + [DC_IERESM] = REG_FIELD(ISP176x_DC_INTENABLE, 4, 4),
> + [DC_IESUSP] = REG_FIELD(ISP176x_DC_INTENABLE, 3, 3),
> + [DC_IEBRST] = REG_FIELD(ISP176x_DC_INTENABLE, 0, 0),
> + [DC_EP0SETUP] = REG_FIELD(ISP176x_DC_EPINDEX, 5, 5),
> + [DC_ENDPIDX] = REG_FIELD(ISP176x_DC_EPINDEX, 1, 4),
> + [DC_EPDIR] = REG_FIELD(ISP176x_DC_EPINDEX, 0, 0),
> + [DC_CLBUF] = REG_FIELD(ISP176x_DC_CTRLFUNC, 4, 4),
> + [DC_VENDP] = REG_FIELD(ISP176x_DC_CTRLFUNC, 3, 3),
> + [DC_DSEN] = REG_FIELD(ISP176x_DC_CTRLFUNC, 2, 2),
> + [DC_STATUS] = REG_FIELD(ISP176x_DC_CTRLFUNC, 1, 1),
> + [DC_STALL] = REG_FIELD(ISP176x_DC_CTRLFUNC, 0, 0),
> + [DC_BUFLEN] = REG_FIELD(ISP176x_DC_BUFLEN, 0, 15),
> + [DC_FFOSZ] = REG_FIELD(ISP176x_DC_EPMAXPKTSZ, 0, 10),
> + [DC_EPENABLE] = REG_FIELD(ISP176x_DC_EPTYPE, 3, 3),
> + [DC_ENDPTYP] = REG_FIELD(ISP176x_DC_EPTYPE, 0, 1),
> + [DC_UFRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 11, 13),
> + [DC_FRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 0, 10),
> + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 10, 10),
> + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 7, 7),
> + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 4, 4),
> + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 3, 3),
> + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 2, 2),
> + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 1, 1),
> + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 0, 0),
> + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 10, 10),
> + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 7, 7),
> + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 4, 4),
> + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 3, 3),
> + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 2, 2),
> + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 1, 1),
> + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 0, 0),
> +};
>
> #endif
> diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
> index 1714b2258b54..1ce21ef291b6 100644
> --- a/drivers/usb/isp1760/isp1760-udc.c
> +++ b/drivers/usb/isp1760/isp1760-udc.c
> @@ -45,16 +45,62 @@ static inline struct isp1760_request *req_to_udc_req(struct usb_request *req)
> return container_of(req, struct isp1760_request, req);
> }
>
> -static inline u32 isp1760_udc_read(struct isp1760_udc *udc, u16 reg)
> +static u32 isp1760_udc_read(struct isp1760_udc *udc, u16 field)
> {
> - return isp1760_read32(udc->regs, reg);
> + return isp1760_field_read(udc->fields, field);
> }
>
> -static inline void isp1760_udc_write(struct isp1760_udc *udc, u16 reg, u32 val)
> +static void isp1760_udc_write(struct isp1760_udc *udc, u16 field, u32 val)
> {
> - isp1760_write32(udc->regs, reg, val);
> + isp1760_field_write(udc->fields, field, val);
> }
>
> +static u32 isp1760_udc_read_raw(struct isp1760_udc *udc, u16 reg)
> +{
> + u32 val;
> +
> + regmap_raw_read(udc->regs, reg, &val, 4);
> +
> + return le32_to_cpu(val);
> +}
> +
> +static u16 isp1760_udc_read_raw16(struct isp1760_udc *udc, u16 reg)
> +{
> + u16 val;
> +
> + regmap_raw_read(udc->regs, reg, &val, 2);
> +
> + return le16_to_cpu(val);
> +}
> +
> +static void isp1760_udc_write_raw(struct isp1760_udc *udc, u16 reg, u32 val)
> +{
> + val = cpu_to_le32(val);
> +
> + regmap_raw_write(udc->regs, reg, &val, 4);
> +}
> +
> +static void isp1760_udc_write_raw16(struct isp1760_udc *udc, u16 reg, u16 val)
> +{
> + val = cpu_to_le16(val);
> +
> + regmap_raw_write(udc->regs, reg, &val, 2);
> +}
> +
> +static void isp1760_udc_set(struct isp1760_udc *udc, u32 field)
> +{
> + isp1760_udc_write(udc, field, 0xFFFFFFFF);
> +}
> +
> +static void isp1760_udc_clear(struct isp1760_udc *udc, u32 field)
> +{
> + isp1760_udc_write(udc, field, 0);
> +}
> +
> +static bool isp1760_udc_is_set(struct isp1760_udc *udc, u32 field)
> +{
> + return !!isp1760_udc_read(udc, field);
> +}
> /* -----------------------------------------------------------------------------
> * Endpoint Management
> */
> @@ -75,11 +121,15 @@ static struct isp1760_ep *isp1760_udc_find_ep(struct isp1760_udc *udc,
> return NULL;
> }
>
> -static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> +static void __isp1760_udc_select_ep(struct isp1760_udc *udc,
> + struct isp1760_ep *ep, int dir)
> {
> - isp1760_udc_write(ep->udc, DC_EPINDEX,
> - DC_ENDPIDX(ep->addr & USB_ENDPOINT_NUMBER_MASK) |
> - (dir == USB_DIR_IN ? DC_EPDIR : 0));
> + isp1760_udc_write(udc, DC_ENDPIDX, ep->addr & USB_ENDPOINT_NUMBER_MASK);
> +
> + if (dir == USB_DIR_IN)
> + isp1760_udc_set(udc, DC_EPDIR);
> + else
> + isp1760_udc_clear(udc, DC_EPDIR);
> }
>
> /**
> @@ -93,9 +143,10 @@ static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> *
> * Called with the UDC spinlock held.
> */
> -static void isp1760_udc_select_ep(struct isp1760_ep *ep)
> +static void isp1760_udc_select_ep(struct isp1760_udc *udc,
> + struct isp1760_ep *ep)
> {
> - __isp1760_udc_select_ep(ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> + __isp1760_udc_select_ep(udc, ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> }
>
> /* Called with the UDC spinlock held. */
> @@ -108,9 +159,13 @@ static void isp1760_udc_ctrl_send_status(struct isp1760_ep *ep, int dir)
> * the direction opposite to the data stage data packets, we thus need
> * to select the OUT/IN endpoint for IN/OUT transfers.
> */
> - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) |
> - (dir == USB_DIR_IN ? 0 : DC_EPDIR));
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STATUS);
> + if (dir == USB_DIR_IN)
> + isp1760_udc_clear(udc, DC_EPDIR);
> + else
> + isp1760_udc_set(udc, DC_EPDIR);
> +
> + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> + isp1760_udc_set(udc, DC_STATUS);
>
> /*
> * The hardware will terminate the request automatically and go back to
> @@ -157,10 +212,10 @@ static void isp1760_udc_ctrl_send_stall(struct isp1760_ep *ep)
> spin_lock_irqsave(&udc->lock, flags);
>
> /* Stall both the IN and OUT endpoints. */
> - __isp1760_udc_select_ep(ep, USB_DIR_OUT);
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> + __isp1760_udc_select_ep(udc, ep, USB_DIR_OUT);
> + isp1760_udc_set(udc, DC_STALL);
> + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> + isp1760_udc_set(udc, DC_STALL);
>
> /* A protocol stall completes the control transaction. */
> udc->ep0_state = ISP1760_CTRL_SETUP;
> @@ -181,8 +236,8 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> u32 *buf;
> int i;
>
> - isp1760_udc_select_ep(ep);
> - len = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> + isp1760_udc_select_ep(udc, ep);
> + len = isp1760_udc_read(udc, DC_BUFLEN);
>
> dev_dbg(udc->isp->dev, "%s: received %u bytes (%u/%u done)\n",
> __func__, len, req->req.actual, req->req.length);
> @@ -198,7 +253,7 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> * datasheet doesn't clearly document how this should be
> * handled.
> */
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> + isp1760_udc_set(udc, DC_CLBUF);
> return false;
> }
>
> @@ -209,9 +264,9 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> * the next packet might be removed from the FIFO.
> */
> for (i = len; i > 2; i -= 4, ++buf)
> - *buf = le32_to_cpu(isp1760_udc_read(udc, DC_DATAPORT));
> + *buf = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> if (i > 0)
> - *(u16 *)buf = le16_to_cpu(readw(udc->regs + DC_DATAPORT));
> + *(u16 *)buf = isp1760_udc_read_raw16(udc, ISP176x_DC_DATAPORT);
>
> req->req.actual += len;
>
> @@ -253,7 +308,7 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> __func__, req->packet_size, req->req.actual,
> req->req.length);
>
> - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
>
> if (req->packet_size)
> isp1760_udc_write(udc, DC_BUFLEN, req->packet_size);
> @@ -265,14 +320,14 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> * the FIFO for this kind of conditions, but doesn't seem to work.
> */
> for (i = req->packet_size; i > 2; i -= 4, ++buf)
> - isp1760_udc_write(udc, DC_DATAPORT, cpu_to_le32(*buf));
> + isp1760_udc_write_raw(udc, ISP176x_DC_DATAPORT, *buf);
> if (i > 0)
> - writew(cpu_to_le16(*(u16 *)buf), udc->regs + DC_DATAPORT);
> + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, *(u16 *)buf);
>
> if (ep->addr == 0)
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> + isp1760_udc_set(udc, DC_DSEN);
> if (!req->packet_size)
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_VENDP);
> + isp1760_udc_set(udc, DC_VENDP);
> }
>
> static void isp1760_ep_rx_ready(struct isp1760_ep *ep)
> @@ -408,19 +463,24 @@ static int __isp1760_udc_set_halt(struct isp1760_ep *ep, bool halt)
> return -EINVAL;
> }
>
> - isp1760_udc_select_ep(ep);
> - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> + isp1760_udc_select_ep(udc, ep);
> +
> + if (halt)
> + isp1760_udc_set(udc, DC_STALL);
> + else
> + isp1760_udc_clear(udc, DC_STALL);
>
> if (ep->addr == 0) {
> /* When halting the control endpoint, stall both IN and OUT. */
> - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> + if (halt)
> + isp1760_udc_set(udc, DC_STALL);
> + else
> + isp1760_udc_clear(udc, DC_STALL);
> } else if (!halt) {
> /* Reset the data PID by cycling the endpoint enable bit. */
> - u16 eptype = isp1760_udc_read(udc, DC_EPTYPE);
> -
> - isp1760_udc_write(udc, DC_EPTYPE, eptype & ~DC_EPENABLE);
> - isp1760_udc_write(udc, DC_EPTYPE, eptype);
> + isp1760_udc_clear(udc, DC_EPENABLE);
> + isp1760_udc_set(udc, DC_EPENABLE);
>
> /*
> * Disabling the endpoint emptied the transmit FIFO, fill it
> @@ -479,12 +539,14 @@ static int isp1760_udc_get_status(struct isp1760_udc *udc,
> return -EINVAL;
> }
>
> - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) | DC_EPDIR);
> + isp1760_udc_set(udc, DC_EPDIR);
> + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> +
> isp1760_udc_write(udc, DC_BUFLEN, 2);
>
> - writew(cpu_to_le16(status), udc->regs + DC_DATAPORT);
> + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, status);
>
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> + isp1760_udc_set(udc, DC_DSEN);
>
> dev_dbg(udc->isp->dev, "%s: status 0x%04x\n", __func__, status);
>
> @@ -508,7 +570,8 @@ static int isp1760_udc_set_address(struct isp1760_udc *udc, u16 addr)
> usb_gadget_set_state(&udc->gadget, addr ? USB_STATE_ADDRESS :
> USB_STATE_DEFAULT);
>
> - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN | addr);
> + isp1760_udc_write(udc, DC_DEVADDR, addr);
> + isp1760_udc_set(udc, DC_DEVEN);
>
> spin_lock(&udc->lock);
> isp1760_udc_ctrl_send_status(&udc->ep[0], USB_DIR_OUT);
> @@ -650,9 +713,9 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
>
> spin_lock(&udc->lock);
>
> - isp1760_udc_write(udc, DC_EPINDEX, DC_EP0SETUP);
> + isp1760_udc_set(udc, DC_EP0SETUP);
>
> - count = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> + count = isp1760_udc_read(udc, DC_BUFLEN);
> if (count != sizeof(req)) {
> spin_unlock(&udc->lock);
>
> @@ -663,8 +726,8 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
> return;
> }
>
> - req.data[0] = isp1760_udc_read(udc, DC_DATAPORT);
> - req.data[1] = isp1760_udc_read(udc, DC_DATAPORT);
> + req.data[0] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> + req.data[1] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
>
> if (udc->ep0_state != ISP1760_CTRL_SETUP) {
> spin_unlock(&udc->lock);
> @@ -732,13 +795,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
>
> switch (usb_endpoint_type(desc)) {
> case USB_ENDPOINT_XFER_ISOC:
> - type = DC_ENDPTYP_ISOC;
> + type = ISP176x_DC_ENDPTYP_ISOC;
> break;
> case USB_ENDPOINT_XFER_BULK:
> - type = DC_ENDPTYP_BULK;
> + type = ISP176x_DC_ENDPTYP_BULK;
> break;
> case USB_ENDPOINT_XFER_INT:
> - type = DC_ENDPTYP_INTERRUPT;
> + type = ISP176x_DC_ENDPTYP_INTERRUPT;
> break;
> case USB_ENDPOINT_XFER_CONTROL:
> default:
> @@ -755,10 +818,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
> uep->halted = false;
> uep->wedged = false;
>
> - isp1760_udc_select_ep(uep);
> - isp1760_udc_write(udc, DC_EPMAXPKTSZ, uep->maxpacket);
> + isp1760_udc_select_ep(udc, uep);
> +
> + isp1760_udc_write(udc, DC_FFOSZ, uep->maxpacket);
> isp1760_udc_write(udc, DC_BUFLEN, uep->maxpacket);
> - isp1760_udc_write(udc, DC_EPTYPE, DC_EPENABLE | type);
> +
> + isp1760_udc_write(udc, DC_ENDPTYP, type);
> + isp1760_udc_set(udc, DC_EPENABLE);
>
> spin_unlock_irqrestore(&udc->lock, flags);
>
> @@ -786,8 +852,9 @@ static int isp1760_ep_disable(struct usb_ep *ep)
> uep->desc = NULL;
> uep->maxpacket = 0;
>
> - isp1760_udc_select_ep(uep);
> - isp1760_udc_write(udc, DC_EPTYPE, 0);
> + isp1760_udc_select_ep(udc, uep);
> + isp1760_udc_clear(udc, DC_EPENABLE);
> + isp1760_udc_clear(udc, DC_ENDPTYP);
>
> /* TODO Synchronize with the IRQ handler */
>
> @@ -864,8 +931,8 @@ static int isp1760_ep_queue(struct usb_ep *ep, struct usb_request *_req,
>
> case ISP1760_CTRL_DATA_OUT:
> list_add_tail(&req->queue, &uep->queue);
> - __isp1760_udc_select_ep(uep, USB_DIR_OUT);
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> + __isp1760_udc_select_ep(udc, uep, USB_DIR_OUT);
> + isp1760_udc_set(udc, DC_DSEN);
> break;
>
> case ISP1760_CTRL_STATUS:
> @@ -1025,14 +1092,14 @@ static void isp1760_ep_fifo_flush(struct usb_ep *ep)
>
> spin_lock_irqsave(&udc->lock, flags);
>
> - isp1760_udc_select_ep(uep);
> + isp1760_udc_select_ep(udc, uep);
>
> /*
> * Set the CLBUF bit twice to flush both buffers in case double
> * buffering is enabled.
> */
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> + isp1760_udc_set(udc, DC_CLBUF);
> + isp1760_udc_set(udc, DC_CLBUF);
>
> spin_unlock_irqrestore(&udc->lock, flags);
> }
> @@ -1091,19 +1158,30 @@ static void isp1760_udc_init_hw(struct isp1760_udc *udc)
> * ACK tokens only (and NYET for the out pipe). The default
> * configuration also generates an interrupt on the first NACK token.
> */
> - isp1760_udc_write(udc, DC_INTCONF, DC_CDBGMOD_ACK | DC_DDBGMODIN_ACK |
> - DC_DDBGMODOUT_ACK_NYET);
> -
> - isp1760_udc_write(udc, DC_INTENABLE, DC_IEPRXTX(7) | DC_IEPRXTX(6) |
> - DC_IEPRXTX(5) | DC_IEPRXTX(4) | DC_IEPRXTX(3) |
> - DC_IEPRXTX(2) | DC_IEPRXTX(1) | DC_IEPRXTX(0) |
> - DC_IEP0SETUP | DC_IEVBUS | DC_IERESM | DC_IESUSP |
> - DC_IEHS_STA | DC_IEBRST);
> + isp1760_udc_set(udc, DC_CDBGMOD_ACK);
> + isp1760_udc_set(udc, DC_DDBGMODIN_ACK);
> + isp1760_udc_set(udc, DC_DDBGMODOUT_ACK);
> +
> + isp1760_udc_set(udc, DC_IEPRXTX_7);
> + isp1760_udc_set(udc, DC_IEPRXTX_6);
> + isp1760_udc_set(udc, DC_IEPRXTX_5);
> + isp1760_udc_set(udc, DC_IEPRXTX_4);
> + isp1760_udc_set(udc, DC_IEPRXTX_3);
> + isp1760_udc_set(udc, DC_IEPRXTX_2);
> + isp1760_udc_set(udc, DC_IEPRXTX_1);
> + isp1760_udc_set(udc, DC_IEPRXTX_0);
> +
> + isp1760_udc_set(udc, DC_IEP0SETUP);
> + isp1760_udc_set(udc, DC_IEVBUS);
> + isp1760_udc_set(udc, DC_IERESM);
> + isp1760_udc_set(udc, DC_IESUSP);
> + isp1760_udc_set(udc, DC_IEHS_STA);
> + isp1760_udc_set(udc, DC_IEBRST);
>
> if (udc->connected)
> isp1760_set_pullup(udc->isp, true);
>
> - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN);
> + isp1760_udc_set(udc, DC_DEVEN);
> }
>
> static void isp1760_udc_reset(struct isp1760_udc *udc)
> @@ -1152,7 +1230,7 @@ static int isp1760_udc_get_frame(struct usb_gadget *gadget)
> {
> struct isp1760_udc *udc = gadget_to_udc(gadget);
>
> - return isp1760_udc_read(udc, DC_FRAMENUM) & ((1 << 11) - 1);
> + return isp1760_udc_read(udc, DC_FRAMENUM);
> }
>
> static int isp1760_udc_wakeup(struct usb_gadget *gadget)
> @@ -1219,7 +1297,7 @@ static int isp1760_udc_start(struct usb_gadget *gadget,
> usb_gadget_set_state(&udc->gadget, USB_STATE_ATTACHED);
>
> /* DMA isn't supported yet, don't enable the DMA clock. */
> - isp1760_udc_write(udc, DC_MODE, DC_GLINTENA);
> + isp1760_udc_set(udc, DC_GLINTENA);
>
> isp1760_udc_init_hw(udc);
>
> @@ -1238,7 +1316,7 @@ static int isp1760_udc_stop(struct usb_gadget *gadget)
>
> del_timer_sync(&udc->vbus_timer);
>
> - isp1760_udc_write(udc, DC_MODE, 0);
> + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
>
> spin_lock_irqsave(&udc->lock, flags);
> udc->driver = NULL;
> @@ -1266,9 +1344,9 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> unsigned int i;
> u32 status;
>
> - status = isp1760_udc_read(udc, DC_INTERRUPT)
> - & isp1760_udc_read(udc, DC_INTENABLE);
> - isp1760_udc_write(udc, DC_INTERRUPT, status);
> + status = isp1760_reg_read(udc->regs, ISP176x_DC_INTERRUPT)
> + & isp1760_reg_read(udc->regs, ISP176x_DC_INTENABLE);
> + isp1760_reg_write(udc->regs, ISP176x_DC_INTERRUPT, status);
>
> if (status & DC_IEVBUS) {
> dev_dbg(udc->isp->dev, "%s(VBUS)\n", __func__);
> @@ -1313,7 +1391,7 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> dev_dbg(udc->isp->dev, "%s(SUSP)\n", __func__);
>
> spin_lock(&udc->lock);
> - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> + if (!isp1760_udc_is_set(udc, DC_VBUSSTAT))
> isp1760_udc_disconnect(udc);
> else
> isp1760_udc_suspend(udc);
> @@ -1335,7 +1413,7 @@ static void isp1760_udc_vbus_poll(struct timer_list *t)
>
> spin_lock_irqsave(&udc->lock, flags);
>
> - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> + if (!(isp1760_udc_is_set(udc, DC_VBUSSTAT)))
> isp1760_udc_disconnect(udc);
> else if (udc->gadget.state >= USB_STATE_POWERED)
> mod_timer(&udc->vbus_timer,
> @@ -1412,9 +1490,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> * register, and reading the scratch register value back. The chip ID
> * and scratch register contents must match the expected values.
> */
> - isp1760_udc_write(udc, DC_SCRATCH, 0xbabe);
> - chipid = isp1760_udc_read(udc, DC_CHIPID);
> - scratch = isp1760_udc_read(udc, DC_SCRATCH);
> + isp1760_reg_write(udc->regs, ISP176x_DC_SCRATCH, 0xbabe);
> + chipid = isp1760_reg_read(udc->regs, ISP176x_DC_CHIPID);
> + scratch = isp1760_reg_read(udc->regs, ISP176x_DC_SCRATCH);
>
> if (scratch != 0xbabe) {
> dev_err(udc->isp->dev,
> @@ -1429,9 +1507,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> }
>
> /* Reset the device controller. */
> - isp1760_udc_write(udc, DC_MODE, DC_SFRESET);
> + isp1760_udc_set(udc, DC_SFRESET);
> usleep_range(10000, 11000);
> - isp1760_udc_write(udc, DC_MODE, 0);
> + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> usleep_range(10000, 11000);
>
> return 0;
> @@ -1445,7 +1523,6 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq,
>
> udc->irq = -1;
> udc->isp = isp;
> - udc->regs = isp->regs;
>
> spin_lock_init(&udc->lock);
> timer_setup(&udc->vbus_timer, isp1760_udc_vbus_poll, 0);
> diff --git a/drivers/usb/isp1760/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
> index d2df650d54e9..a49096c0ac8e 100644
> --- a/drivers/usb/isp1760/isp1760-udc.h
> +++ b/drivers/usb/isp1760/isp1760-udc.h
> @@ -17,6 +17,8 @@
> #include <linux/timer.h>
> #include <linux/usb/gadget.h>
>
> +#include "isp1760-regs.h"
Is this needed ?
> +
> struct isp1760_device;
> struct isp1760_udc;
>
> @@ -48,7 +50,7 @@ struct isp1760_ep {
> * struct isp1760_udc - UDC state information
> * irq: IRQ number
> * irqname: IRQ name (as passed to request_irq)
> - * regs: Base address of the UDC registers
> + * regs: regmap for UDC registers
> * driver: Gadget driver
> * gadget: Gadget device
> * lock: Protects driver, vbus_timer, ep, ep0_*, DC_EPINDEX register
> @@ -59,12 +61,13 @@ struct isp1760_ep {
> * connected: Tracks gadget driver bus connection state
> */
> struct isp1760_udc {
> -#ifdef CONFIG_USB_ISP1761_UDC
> struct isp1760_device *isp;
>
> int irq;
> char *irqname;
> - void __iomem *regs;
> +
> + struct regmap *regs;
> + struct regmap_field *fields[DC_FIELD_MAX];
>
> struct usb_gadget_driver *driver;
> struct usb_gadget gadget;
> @@ -81,7 +84,6 @@ struct isp1760_udc {
> bool connected;
>
> unsigned int devstatus;
> -#endif
> };
>
> #ifdef CONFIG_USB_ISP1761_UDC
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 1/7] usb: isp1760: move to regmap for register access
2021-05-06 12:24 ` Laurent Pinchart
@ 2021-05-06 13:39 ` Rui Miguel Silva
2021-05-06 13:45 ` Laurent Pinchart
0 siblings, 1 reply; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-06 13:39 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Greg Kroah-Hartman, Sebastian Siewior, Rob Herring, linux-usb,
devicetree
Hi Laurent,
On Thu May 6, 2021 at 1:24 PM WEST, Laurent Pinchart wrote:
> Hi Rui,
>
> Thank you for the patch.
Thanks for the review.
>
> On Tue, May 04, 2021 at 11:19:04AM +0100, Rui Miguel Silva wrote:
> > Rework access to registers and memory to use regmap framework.
> > No change in current feature or way of work is intended with this
> > change.
> >
> > This will allow to reuse this driver with other IP of this family,
> > for example isp1763, with little changes and effort.
> >
> > Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
> > ---
> > drivers/usb/isp1760/isp1760-core.c | 123 +++++---
> > drivers/usb/isp1760/isp1760-core.h | 38 ++-
> > drivers/usb/isp1760/isp1760-hcd.c | 436 ++++++++++++++--------------
> > drivers/usb/isp1760/isp1760-hcd.h | 18 +-
> > drivers/usb/isp1760/isp1760-if.c | 4 +-
> > drivers/usb/isp1760/isp1760-regs.h | 442 +++++++++++++++++------------
> > drivers/usb/isp1760/isp1760-udc.c | 235 +++++++++------
> > drivers/usb/isp1760/isp1760-udc.h | 10 +-
> > 8 files changed, 779 insertions(+), 527 deletions(-)
> >
> > diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
> > index fdeb4cf97cc5..f78e637d3b9a 100644
> > --- a/drivers/usb/isp1760/isp1760-core.c
> > +++ b/drivers/usb/isp1760/isp1760-core.c
> > @@ -25,8 +25,8 @@
> >
> > static void isp1760_init_core(struct isp1760_device *isp)
> > {
> > - u32 otgctrl;
> > - u32 hwmode;
> > + struct isp1760_hcd *hcd = &isp->hcd;
> > + struct isp1760_udc *udc = &isp->udc;
> >
> > /* Low-level chip reset */
> > if (isp->rst_gpio) {
> > @@ -39,24 +39,22 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > * Reset the host controller, including the CPU interface
> > * configuration.
> > */
> > - isp1760_write32(isp->regs, HC_RESET_REG, SW_RESET_RESET_ALL);
> > + isp1760_field_set(hcd->fields, SW_RESET_RESET_ALL);
> > msleep(100);
> >
> > /* Setup HW Mode Control: This assumes a level active-low interrupt */
> > - hwmode = HW_DATA_BUS_32BIT;
> > -
> > if (isp->devflags & ISP1760_FLAG_BUS_WIDTH_16)
> > - hwmode &= ~HW_DATA_BUS_32BIT;
> > + isp1760_field_clear(hcd->fields, HW_DATA_BUS_WIDTH);
> > if (isp->devflags & ISP1760_FLAG_ANALOG_OC)
> > - hwmode |= HW_ANA_DIGI_OC;
> > + isp1760_field_set(hcd->fields, HW_ANA_DIGI_OC);
> > if (isp->devflags & ISP1760_FLAG_DACK_POL_HIGH)
> > - hwmode |= HW_DACK_POL_HIGH;
> > + isp1760_field_set(hcd->fields, HW_DACK_POL_HIGH);
> > if (isp->devflags & ISP1760_FLAG_DREQ_POL_HIGH)
> > - hwmode |= HW_DREQ_POL_HIGH;
> > + isp1760_field_set(hcd->fields, HW_DREQ_POL_HIGH);
> > if (isp->devflags & ISP1760_FLAG_INTR_POL_HIGH)
> > - hwmode |= HW_INTR_HIGH_ACT;
> > + isp1760_field_set(hcd->fields, HW_INTR_HIGH_ACT);
> > if (isp->devflags & ISP1760_FLAG_INTR_EDGE_TRIG)
> > - hwmode |= HW_INTR_EDGE_TRIG;
> > + isp1760_field_set(hcd->fields, HW_INTR_EDGE_TRIG);
>
> This makes a difference, as you're now writing the register for every
> bit. It can have a performance impact (although that should be small,
This is in initialization time, so I am not expecting this to have a
major performance impact.
> but still), but also a functional impact. I'd rather keep a single write
> for this kind of sequence, especially when no read-modify-write sequence
> is needed. If you need read-modify-write for the platform you work on,
> switching to such patterns should be done in a patch of its own.
For me that's ok, I do not have strong feelings about this. I can
change it for isp1760_reg_write at the end.
>
> >
> > /*
> > * The ISP1761 has a dedicated DC IRQ line but supports sharing the HC
> > @@ -65,18 +63,10 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > * spurious interrupts during HCD registration.
> > */
> > if (isp->devflags & ISP1760_FLAG_ISP1761) {
> > - isp1760_write32(isp->regs, DC_MODE, 0);
> > - hwmode |= HW_COMN_IRQ;
> > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > + isp1760_field_set(hcd->fields, HW_COMN_IRQ);
> > }
> >
> > - /*
> > - * We have to set this first in case we're in 16-bit mode.
> > - * Write it twice to ensure correct upper bits if switching
> > - * to 16-bit mode.
> > - */
> > - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> > - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> > -
> > /*
> > * PORT 1 Control register of the ISP1760 is the OTG control register
> > * on ISP1761.
> > @@ -85,14 +75,15 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > * when OTG is requested.
> > */
> > if ((isp->devflags & ISP1760_FLAG_ISP1761) &&
> > - (isp->devflags & ISP1760_FLAG_OTG_EN))
> > - otgctrl = ((HW_DM_PULLDOWN | HW_DP_PULLDOWN) << 16)
> > - | HW_OTG_DISABLE;
> > - else
> > - otgctrl = (HW_SW_SEL_HC_DC << 16)
> > - | (HW_VBUS_DRV | HW_SEL_CP_EXT);
> > -
> > - isp1760_write32(isp->regs, HC_PORT1_CTRL, otgctrl);
> > + (isp->devflags & ISP1760_FLAG_OTG_EN)) {
> > + isp1760_field_set(hcd->fields, HW_DM_PULLDOWN);
> > + isp1760_field_set(hcd->fields, HW_DP_PULLDOWN);
> > + isp1760_field_set(hcd->fields, HW_OTG_DISABLE);
> > + } else {
> > + isp1760_field_set(hcd->fields, HW_SW_SEL_HC_DC);
> > + isp1760_field_set(hcd->fields, HW_VBUS_DRV);
> > + isp1760_field_set(hcd->fields, HW_SEL_CP_EXT);
> > + }
> >
> > dev_info(isp->dev, "bus width: %u, oc: %s\n",
> > isp->devflags & ISP1760_FLAG_BUS_WIDTH_16 ? 16 : 32,
> > @@ -101,16 +92,43 @@ static void isp1760_init_core(struct isp1760_device *isp)
> >
> > void isp1760_set_pullup(struct isp1760_device *isp, bool enable)
> > {
> > - isp1760_write32(isp->regs, HW_OTG_CTRL_SET,
> > - enable ? HW_DP_PULLUP : HW_DP_PULLUP << 16);
> > + struct isp1760_udc *udc = &isp->udc;
> > +
> > + if (enable)
> > + isp1760_field_set(udc->fields, HW_DP_PULLUP);
> > + else
> > + isp1760_field_set(udc->fields, HW_DP_PULLUP_CLEAR);
> > }
> >
> > +static struct regmap_config isp1760_hc_regmap_conf = {
> > + .name = "isp1760-hc",
> > + .reg_bits = 16,
> > + .val_bits = 32,
> > + .fast_io = true,
> > + .max_register = ISP176x_HC_MEMORY,
> > + .volatile_table = &isp176x_hc_volatile_table,
> > +};
> > +
> > +static struct regmap_config isp1761_dc_regmap_conf = {
> > + .name = "isp1761-dc",
> > + .reg_bits = 16,
> > + .val_bits = 32,
> > + .fast_io = true,
> > + .max_register = ISP1761_DC_OTG_CTRL_CLEAR,
> > + .volatile_table = &isp176x_dc_volatile_table,
> > +};
> > +
> > int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > struct device *dev, unsigned int devflags)
> > {
> > struct isp1760_device *isp;
> > + struct isp1760_hcd *hcd;
> > + struct isp1760_udc *udc;
> > bool udc_disabled = !(devflags & ISP1760_FLAG_ISP1761);
> > + struct regmap_field *f;
> > + void __iomem *base;
> > int ret;
> > + int i;
> >
> > /*
> > * If neither the HCD not the UDC is enabled return an error, as no
> > @@ -126,19 +144,52 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> >
> > isp->dev = dev;
> > isp->devflags = devflags;
> > + hcd = &isp->hcd;
> > + udc = &isp->udc;
> > +
> > + if (devflags & ISP1760_FLAG_BUS_WIDTH_16) {
> > + isp1760_hc_regmap_conf.val_bits = 16;
> > + isp1761_dc_regmap_conf.val_bits = 16;
> > + }
> >
> > isp->rst_gpio = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);
> > if (IS_ERR(isp->rst_gpio))
> > return PTR_ERR(isp->rst_gpio);
> >
> > - isp->regs = devm_ioremap_resource(dev, mem);
> > - if (IS_ERR(isp->regs))
> > - return PTR_ERR(isp->regs);
> > + hcd->base = devm_ioremap_resource(dev, mem);
> > + if (IS_ERR(hcd->base))
> > + return PTR_ERR(hcd->base);
> > +
> > + hcd->regs = devm_regmap_init_mmio(dev, base, &isp1760_hc_regmap_conf);
> > + if (IS_ERR(hcd->regs))
> > + return PTR_ERR(hcd->regs);
> > +
> > + for (i = 0; i < HC_FIELD_MAX; i++) {
> > + f = devm_regmap_field_alloc(dev, hcd->regs,
> > + isp1760_hc_reg_fields[i]);
> > + if (IS_ERR(f))
> > + return PTR_ERR(f);
> > +
> > + hcd->fields[i] = f;
> > + }
> > +
> > + udc->regs = devm_regmap_init_mmio(dev, base, &isp1761_dc_regmap_conf);
> > + if (IS_ERR(udc->regs))
> > + return PTR_ERR(udc->regs);
> > +
> > + for (i = 0; i < DC_FIELD_MAX; i++) {
> > + f = devm_regmap_field_alloc(dev, udc->regs,
> > + isp1761_dc_reg_fields[i]);
> > + if (IS_ERR(f))
> > + return PTR_ERR(f);
> > +
> > + udc->fields[i] = f;
> > + }
> >
> > isp1760_init_core(isp);
> >
> > if (IS_ENABLED(CONFIG_USB_ISP1760_HCD) && !usb_disabled()) {
> > - ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq,
> > + ret = isp1760_hcd_register(hcd, mem, irq,
> > irqflags | IRQF_SHARED, dev);
> > if (ret < 0)
> > return ret;
> > @@ -147,7 +198,7 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > if (IS_ENABLED(CONFIG_USB_ISP1761_UDC) && !udc_disabled) {
> > ret = isp1760_udc_register(isp, irq, irqflags);
> > if (ret < 0) {
> > - isp1760_hcd_unregister(&isp->hcd);
> > + isp1760_hcd_unregister(hcd);
> > return ret;
> > }
> > }
> > diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
> > index d9a0a4cc467c..8fec6395f19f 100644
> > --- a/drivers/usb/isp1760/isp1760-core.h
> > +++ b/drivers/usb/isp1760/isp1760-core.h
> > @@ -14,6 +14,7 @@
> > #define _ISP1760_CORE_H_
> >
> > #include <linux/ioport.h>
> > +#include <linux/regmap.h>
> >
> > #include "isp1760-hcd.h"
> > #include "isp1760-udc.h"
> > @@ -38,7 +39,6 @@ struct gpio_desc;
> > struct isp1760_device {
> > struct device *dev;
> >
> > - void __iomem *regs;
> > unsigned int devflags;
> > struct gpio_desc *rst_gpio;
> >
> > @@ -52,14 +52,42 @@ void isp1760_unregister(struct device *dev);
> >
> > void isp1760_set_pullup(struct isp1760_device *isp, bool enable);
> >
> > -static inline u32 isp1760_read32(void __iomem *base, u32 reg)
> > +static inline u32 isp1760_field_read(struct regmap_field **fields, u32 field)
> > {
> > - return readl(base + reg);
> > + unsigned int val;
> > +
> > + regmap_field_read(fields[field], &val);
> > +
> > + return val;
> > +}
> > +
> > +static inline void isp1760_field_write(struct regmap_field **fields, u32 field,
> > + u32 val)
> > +{
> > + regmap_field_write(fields[field], val);
> > +}
> > +
> > +static inline void isp1760_field_set(struct regmap_field **fields, u32 field)
> > +{
> > + isp1760_field_write(fields, field, 0xFFFFFFFF);
> > }
> >
> > -static inline void isp1760_write32(void __iomem *base, u32 reg, u32 val)
> > +static inline void isp1760_field_clear(struct regmap_field **fields, u32 field)
> > {
> > - writel(val, base + reg);
> > + isp1760_field_write(fields, field, 0);
> > }
> >
> > +static inline u32 isp1760_reg_read(struct regmap *regs, u32 reg)
> > +{
> > + unsigned int val;
> > +
> > + regmap_read(regs, reg, &val);
> > +
> > + return val;
> > +}
> > +
> > +static inline void isp1760_reg_write(struct regmap *regs, u32 reg, u32 val)
> > +{
> > + regmap_write(regs, reg, val);
> > +}
> > #endif
> > diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
> > index 33ae656c4b68..0601b1a4bd42 100644
> > --- a/drivers/usb/isp1760/isp1760-hcd.c
> > +++ b/drivers/usb/isp1760/isp1760-hcd.c
> > @@ -66,6 +66,10 @@ struct ptd {
> > #define ATL_PTD_OFFSET 0x0c00
> > #define PAYLOAD_OFFSET 0x1000
> >
> > +#define ISP_BANK_0 0x00
> > +#define ISP_BANK_1 0x01
> > +#define ISP_BANK_2 0x02
> > +#define ISP_BANK_3 0x03
> >
> > /* ATL */
> > /* DW0 */
> > @@ -159,16 +163,59 @@ struct urb_listitem {
> > };
> >
> > /*
> > - * Access functions for isp176x registers (addresses 0..0x03FF).
> > + * Access functions for isp176x registers regmap fields
> > */
> > -static u32 reg_read32(void __iomem *base, u32 reg)
> > +static u32 isp1760_hcd_read(struct usb_hcd *hcd, u32 field)
> > {
> > - return isp1760_read32(base, reg);
> > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > +
> > + return isp1760_field_read(priv->fields, field);
> > +}
> > +
> > +static void isp1760_hcd_write(struct usb_hcd *hcd, u32 field, u32 val)
> > +{
> > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > +
> > + isp1760_field_write(priv->fields, field, val);
> > +}
> > +
> > +static void isp1760_hcd_set(struct usb_hcd *hcd, u32 field)
> > +{
> > + isp1760_hcd_write(hcd, field, 0xFFFFFFFF);
> > +}
> > +
> > +static void isp1760_hcd_clear(struct usb_hcd *hcd, u32 field)
> > +{
> > + isp1760_hcd_write(hcd, field, 0);
> > +}
> > +
> > +static int isp1760_hcd_set_poll_timeout(struct usb_hcd *hcd, u32 field,
> > + u32 timeout_us)
> > +{
> > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > + unsigned int val;
> > +
> > + isp1760_hcd_set(hcd, field);
> > +
> > + return regmap_field_read_poll_timeout(priv->fields[field], val, 1, 1,
> > + timeout_us);
> > }
> >
> > -static void reg_write32(void __iomem *base, u32 reg, u32 val)
> > +static int isp1760_hcd_clear_poll_timeout(struct usb_hcd *hcd, u32 field,
> > + u32 timeout_us)
> > {
> > - isp1760_write32(base, reg, val);
> > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > + unsigned int val;
> > +
> > + isp1760_hcd_clear(hcd, field);
> > +
> > + return regmap_field_read_poll_timeout(priv->fields[field], val, 0, 1,
> > + timeout_us);
> > +}
> > +
> > +static bool isp1760_hcd_is_set(struct usb_hcd *hcd, u32 field)
> > +{
> > + return !!isp1760_hcd_read(hcd, field);
> > }
> >
> > /*
> > @@ -231,12 +278,15 @@ static void bank_reads8(void __iomem *src_base, u32 src_offset, u32 bank_addr,
> > }
> > }
> >
> > -static void mem_reads8(void __iomem *src_base, u32 src_offset, void *dst,
> > - u32 bytes)
> > +static void mem_reads8(struct usb_hcd *hcd, void __iomem *src_base,
> > + u32 src_offset, void *dst, u32 bytes)
> > {
> > - reg_write32(src_base, HC_MEMORY_REG, src_offset + ISP_BANK(0));
> > + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> > + isp1760_hcd_write(hcd, MEM_START_ADDR, src_offset);
> > +
> > ndelay(90);
> > - bank_reads8(src_base, src_offset, ISP_BANK(0), dst, bytes);
> > +
> > + bank_reads8(src_base, src_offset, ISP_BANK_0, dst, bytes);
> > }
> >
> > static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> > @@ -278,14 +328,15 @@ static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> > * Read and write ptds. 'ptd_offset' should be one of ISO_PTD_OFFSET,
> > * INT_PTD_OFFSET, and ATL_PTD_OFFSET. 'slot' should be less than 32.
> > */
> > -static void ptd_read(void __iomem *base, u32 ptd_offset, u32 slot,
> > - struct ptd *ptd)
> > +static void ptd_read(struct usb_hcd *hcd, void __iomem *base,
> > + u32 ptd_offset, u32 slot, struct ptd *ptd)
> > {
> > - reg_write32(base, HC_MEMORY_REG,
> > - ISP_BANK(0) + ptd_offset + slot*sizeof(*ptd));
> > + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> > + isp1760_hcd_write(hcd, MEM_START_ADDR,
> > + ptd_offset + slot * sizeof(*ptd));
> > ndelay(90);
> > - bank_reads8(base, ptd_offset + slot*sizeof(*ptd), ISP_BANK(0),
> > - (void *) ptd, sizeof(*ptd));
> > + bank_reads8(base, ptd_offset + slot * sizeof(*ptd), ISP_BANK_0,
> > + (void *)ptd, sizeof(*ptd));
> > }
> >
> > static void ptd_write(void __iomem *base, u32 ptd_offset, u32 slot,
> > @@ -377,34 +428,15 @@ static void free_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
> > qtd->payload_addr = 0;
> > }
> >
> > -static int handshake(struct usb_hcd *hcd, u32 reg,
> > - u32 mask, u32 done, int usec)
> > -{
> > - u32 result;
> > - int ret;
> > -
> > - ret = readl_poll_timeout_atomic(hcd->regs + reg, result,
> > - ((result & mask) == done ||
> > - result == U32_MAX), 1, usec);
> > - if (result == U32_MAX)
> > - return -ENODEV;
> > -
> > - return ret;
> > -}
> > -
> > /* reset a non-running (STS_HALT == 1) controller */
> > static int ehci_reset(struct usb_hcd *hcd)
> > {
> > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> >
> > - u32 command = reg_read32(hcd->regs, HC_USBCMD);
> > -
> > - command |= CMD_RESET;
> > - reg_write32(hcd->regs, HC_USBCMD, command);
> > hcd->state = HC_STATE_HALT;
> > priv->next_statechange = jiffies;
> >
> > - return handshake(hcd, HC_USBCMD, CMD_RESET, 0, 250 * 1000);
> > + return isp1760_hcd_set_poll_timeout(hcd, CMD_RESET, 250 * 1000);
> > }
> >
> > static struct isp1760_qh *qh_alloc(gfp_t flags)
> > @@ -432,8 +464,10 @@ static void qh_free(struct isp1760_qh *qh)
> > /* one-time init, only for memory state */
> > static int priv_init(struct usb_hcd *hcd)
> > {
> > - struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > - u32 hcc_params;
> > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > + u32 isoc_cache;
> > + u32 isoc_thres;
> > +
> > int i;
> >
> > spin_lock_init(&priv->lock);
> > @@ -448,12 +482,14 @@ static int priv_init(struct usb_hcd *hcd)
> > priv->periodic_size = DEFAULT_I_TDPS;
> >
> > /* controllers may cache some of the periodic schedule ... */
> > - hcc_params = reg_read32(hcd->regs, HC_HCCPARAMS);
> > + isoc_cache = isp1760_hcd_read(hcd->regs, HCC_ISOC_CACHE);
> > + isoc_thres = isp1760_hcd_read(hcd->regs, HCC_ISOC_THRES);
> > +
> > /* full frame cache */
> > - if (HCC_ISOC_CACHE(hcc_params))
> > + if (isoc_cache)
> > priv->i_thresh = 8;
> > else /* N microframes cached */
> > - priv->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
> > + priv->i_thresh = 2 + isoc_thres;
> >
> > return 0;
> > }
> > @@ -462,12 +498,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > {
> > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > int result;
> > - u32 scratch, hwmode;
> > + u32 scratch;
> > +
> > + isp1760_reg_write(priv->regs, ISP176x_HC_SCRATCH, 0xdeadbabe);
> >
> > - reg_write32(hcd->regs, HC_SCRATCH_REG, 0xdeadbabe);
> > /* Change bus pattern */
> > - scratch = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> > - scratch = reg_read32(hcd->regs, HC_SCRATCH_REG);
> > + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> > + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_SCRATCH);
> > if (scratch != 0xdeadbabe) {
> > dev_err(hcd->self.controller, "Scratch test failed.\n");
> > return -ENODEV;
> > @@ -481,10 +518,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > * the host controller through the EHCI USB Command register. The device
> > * has been reset in core code anyway, so this shouldn't matter.
> > */
> > - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG, 0);
> > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_BUFFER_STATUS, 0);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > + NO_TRANSFER_ACTIVE);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > + NO_TRANSFER_ACTIVE);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP,
> > + NO_TRANSFER_ACTIVE);
> >
> > result = ehci_reset(hcd);
> > if (result)
> > @@ -493,14 +533,11 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > /* Step 11 passed */
> >
> > /* ATL reset */
> > - hwmode = reg_read32(hcd->regs, HC_HW_MODE_CTRL) & ~ALL_ATX_RESET;
> > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode | ALL_ATX_RESET);
> > + isp1760_hcd_set(hcd, ALL_ATX_RESET);
> > mdelay(10);
> > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode);
> > -
> > - reg_write32(hcd->regs, HC_INTERRUPT_ENABLE, INTERRUPT_ENABLE_MASK);
> > + isp1760_hcd_clear(hcd, ALL_ATX_RESET);
> >
> > - priv->hcs_params = reg_read32(hcd->regs, HC_HCSPARAMS);
> > + isp1760_hcd_set(hcd, HC_INT_ENABLE);
> >
> > return priv_init(hcd);
> > }
> > @@ -730,12 +767,12 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
> >
> > /* Make sure done map has not triggered from some unlinked transfer */
> > if (ptd_offset == ATL_PTD_OFFSET) {
> > - priv->atl_done_map |= reg_read32(hcd->regs,
> > - HC_ATL_PTD_DONEMAP_REG);
> > + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> > + ISP176x_HC_ATL_PTD_DONEMAP);
> > priv->atl_done_map &= ~(1 << slot);
> > } else {
> > - priv->int_done_map |= reg_read32(hcd->regs,
> > - HC_INT_PTD_DONEMAP_REG);
> > + priv->int_done_map |= isp1760_reg_read(priv->regs,
> > + ISP176x_HC_INT_PTD_DONEMAP);
> > priv->int_done_map &= ~(1 << slot);
> > }
> >
> > @@ -744,16 +781,20 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
> > slots[slot].timestamp = jiffies;
> > slots[slot].qtd = qtd;
> > slots[slot].qh = qh;
> > - ptd_write(hcd->regs, ptd_offset, slot, ptd);
> > + ptd_write(priv->base, ptd_offset, slot, ptd);
> >
> > if (ptd_offset == ATL_PTD_OFFSET) {
> > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > + skip_map = isp1760_reg_read(priv->regs,
> > + ISP176x_HC_ATL_PTD_SKIPMAP);
> > skip_map &= ~(1 << qh->slot);
> > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > + skip_map);
> > } else {
> > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > + skip_map = isp1760_reg_read(priv->regs,
> > + ISP176x_HC_INT_PTD_SKIPMAP);
> > skip_map &= ~(1 << qh->slot);
> > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > + skip_map);
> > }
> > }
> >
> > @@ -766,9 +807,10 @@ static int is_short_bulk(struct isp1760_qtd *qtd)
> > static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> > struct list_head *urb_list)
> > {
> > - int last_qtd;
> > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > struct isp1760_qtd *qtd, *qtd_next;
> > struct urb_listitem *urb_listitem;
> > + int last_qtd;
> >
> > list_for_each_entry_safe(qtd, qtd_next, &qh->qtd_list, qtd_list) {
> > if (qtd->status < QTD_XFER_COMPLETE)
> > @@ -783,9 +825,10 @@ static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> > if (qtd->actual_length) {
> > switch (qtd->packet_type) {
> > case IN_PID:
> > - mem_reads8(hcd->regs, qtd->payload_addr,
> > - qtd->data_buffer,
> > - qtd->actual_length);
> > + mem_reads8(hcd, priv->base,
> > + qtd->payload_addr,
> > + qtd->data_buffer,
> > + qtd->actual_length);
> > fallthrough;
> > case OUT_PID:
> > qtd->urb->actual_length +=
> > @@ -873,8 +916,8 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
> > if ((qtd->length) &&
> > ((qtd->packet_type == SETUP_PID) ||
> > (qtd->packet_type == OUT_PID))) {
> > - mem_writes8(hcd->regs, qtd->payload_addr,
> > - qtd->data_buffer, qtd->length);
> > + mem_writes8(priv->base, qtd->payload_addr,
> > + qtd->data_buffer, qtd->length);
> > }
> >
> > qtd->status = QTD_PAYLOAD_ALLOC;
> > @@ -1074,9 +1117,9 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > int modified;
> > int skip_map;
> >
> > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP);
> > priv->int_done_map &= ~skip_map;
> > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP);
> > priv->atl_done_map &= ~skip_map;
> >
> > modified = priv->int_done_map || priv->atl_done_map;
> > @@ -1094,7 +1137,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > continue;
> > }
> > ptd_offset = INT_PTD_OFFSET;
> > - ptd_read(hcd->regs, INT_PTD_OFFSET, slot, &ptd);
> > + ptd_read(hcd, priv->base, INT_PTD_OFFSET, slot, &ptd);
> > state = check_int_transfer(hcd, &ptd,
> > slots[slot].qtd->urb);
> > } else {
> > @@ -1109,7 +1152,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > continue;
> > }
> > ptd_offset = ATL_PTD_OFFSET;
> > - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> > + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> > state = check_atl_transfer(hcd, &ptd,
> > slots[slot].qtd->urb);
> > }
> > @@ -1134,7 +1177,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> >
> > qtd->status = QTD_XFER_COMPLETE;
> > if (list_is_last(&qtd->qtd_list, &qh->qtd_list) ||
> > - is_short_bulk(qtd))
> > + is_short_bulk(qtd))
> > qtd = NULL;
> > else
> > qtd = list_entry(qtd->qtd_list.next,
> > @@ -1210,13 +1253,15 @@ static irqreturn_t isp1760_irq(struct usb_hcd *hcd)
> > if (!(hcd->state & HC_STATE_RUNNING))
> > goto leave;
> >
> > - imask = reg_read32(hcd->regs, HC_INTERRUPT_REG);
> > + imask = isp1760_reg_read(priv->regs, ISP176x_HC_INTERRUPT);
> > if (unlikely(!imask))
> > goto leave;
> > - reg_write32(hcd->regs, HC_INTERRUPT_REG, imask); /* Clear */
> > + isp1760_reg_write(priv->regs, ISP176x_HC_INTERRUPT, imask); /* Clear */
> >
> > - priv->int_done_map |= reg_read32(hcd->regs, HC_INT_PTD_DONEMAP_REG);
> > - priv->atl_done_map |= reg_read32(hcd->regs, HC_ATL_PTD_DONEMAP_REG);
> > + priv->int_done_map |= isp1760_reg_read(priv->regs,
> > + ISP176x_HC_INT_PTD_DONEMAP);
> > + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> > + ISP176x_HC_ATL_PTD_DONEMAP);
> >
> > handle_done_ptds(hcd);
> >
> > @@ -1271,7 +1316,7 @@ static void errata2_function(struct timer_list *unused)
> > if (priv->atl_slots[slot].qh && time_after(jiffies,
> > priv->atl_slots[slot].timestamp +
> > msecs_to_jiffies(SLOT_TIMEOUT))) {
> > - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> > + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> > if (!FROM_DW0_VALID(ptd.dw0) &&
> > !FROM_DW3_ACTIVE(ptd.dw3))
> > priv->atl_done_map |= 1 << slot;
> > @@ -1288,9 +1333,8 @@ static void errata2_function(struct timer_list *unused)
> >
> > static int isp1760_run(struct usb_hcd *hcd)
> > {
> > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > int retval;
> > - u32 temp;
> > - u32 command;
> > u32 chipid;
> >
> > hcd->uses_new_polling = 1;
> > @@ -1298,23 +1342,20 @@ static int isp1760_run(struct usb_hcd *hcd)
> > hcd->state = HC_STATE_RUNNING;
> >
> > /* Set PTD interrupt AND & OR maps */
> > - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_AND_REG, 0);
> > - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_OR_REG, 0xffffffff);
> > - reg_write32(hcd->regs, HC_INT_IRQ_MASK_AND_REG, 0);
> > - reg_write32(hcd->regs, HC_INT_IRQ_MASK_OR_REG, 0xffffffff);
> > - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_AND_REG, 0);
> > - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_OR_REG, 0xffffffff);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_AND, 0);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_OR, 0xffffffff);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_AND, 0);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_OR, 0xffffffff);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_AND, 0);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_OR, 0xffffffff);
> > /* step 23 passed */
> >
> > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp | HW_GLOBAL_INTR_EN);
> > + isp1760_hcd_set(hcd, HW_GLOBAL_INTR_EN);
> >
> > - command = reg_read32(hcd->regs, HC_USBCMD);
> > - command &= ~(CMD_LRESET|CMD_RESET);
> > - command |= CMD_RUN;
> > - reg_write32(hcd->regs, HC_USBCMD, command);
> > + isp1760_hcd_clear(hcd, CMD_LRESET);
> > + isp1760_hcd_clear(hcd, CMD_RESET);
> >
> > - retval = handshake(hcd, HC_USBCMD, CMD_RUN, CMD_RUN, 250 * 1000);
> > + retval = isp1760_hcd_set_poll_timeout(hcd, CMD_RUN, 250 * 1000);
> > if (retval)
> > return retval;
> >
> > @@ -1324,9 +1365,8 @@ static int isp1760_run(struct usb_hcd *hcd)
> > * the semaphore while doing so.
> > */
> > down_write(&ehci_cf_port_reset_rwsem);
> > - reg_write32(hcd->regs, HC_CONFIGFLAG, FLAG_CF);
> >
> > - retval = handshake(hcd, HC_CONFIGFLAG, FLAG_CF, FLAG_CF, 250 * 1000);
> > + retval = isp1760_hcd_set_poll_timeout(hcd, FLAG_CF, 250 * 1000);
> > up_write(&ehci_cf_port_reset_rwsem);
> > if (retval)
> > return retval;
> > @@ -1336,21 +1376,22 @@ static int isp1760_run(struct usb_hcd *hcd)
> > errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
> > add_timer(&errata2_timer);
> >
> > - chipid = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> > + chipid = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> > dev_info(hcd->self.controller, "USB ISP %04x HW rev. %d started\n",
> > chipid & 0xffff, chipid >> 16);
> >
> > /* PTD Register Init Part 2, Step 28 */
> >
> > /* Setup registers controlling PTD checking */
> > - reg_write32(hcd->regs, HC_ATL_PTD_LASTPTD_REG, 0x80000000);
> > - reg_write32(hcd->regs, HC_INT_PTD_LASTPTD_REG, 0x80000000);
> > - reg_write32(hcd->regs, HC_ISO_PTD_LASTPTD_REG, 0x00000001);
> > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, 0xffffffff);
> > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, 0xffffffff);
> > - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, 0xffffffff);
> > - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG,
> > - ATL_BUF_FILL | INT_BUF_FILL);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_LASTPTD, 0x80000000);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_LASTPTD, 0x80000000);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_LASTPTD, 0x00000001);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP, 0xffffffff);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP, 0xffffffff);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP, 0xffffffff);
> > +
> > + isp1760_hcd_set(hcd, ATL_BUF_FILL);
> > + isp1760_hcd_set(hcd, INT_BUF_FILL);
> >
> > /* GRR this is run-once init(), being done every time the HC starts.
> > * So long as they're part of class devices, we can't do it init()
> > @@ -1584,15 +1625,19 @@ static void kill_transfer(struct usb_hcd *hcd, struct urb *urb,
> > /* We need to forcefully reclaim the slot since some transfers never
> > return, e.g. interrupt transfers and NAKed bulk transfers. */
> > if (usb_pipecontrol(urb->pipe) || usb_pipebulk(urb->pipe)) {
> > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > + skip_map = isp1760_reg_read(priv->regs,
> > + ISP176x_HC_ATL_PTD_SKIPMAP);
> > skip_map |= (1 << qh->slot);
> > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > + skip_map);
> > priv->atl_slots[qh->slot].qh = NULL;
> > priv->atl_slots[qh->slot].qtd = NULL;
> > } else {
> > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > + skip_map = isp1760_reg_read(priv->regs,
> > + ISP176x_HC_INT_PTD_SKIPMAP);
> > skip_map |= (1 << qh->slot);
> > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > + skip_map);
> > priv->int_slots[qh->slot].qh = NULL;
> > priv->int_slots[qh->slot].qtd = NULL;
> > }
> > @@ -1705,8 +1750,7 @@ static void isp1760_endpoint_disable(struct usb_hcd *hcd,
> > static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > {
> > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > - u32 temp, status = 0;
> > - u32 mask;
> > + u32 status = 0;
> > int retval = 1;
> > unsigned long flags;
> >
> > @@ -1716,17 +1760,13 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> >
> > /* init status to no-changes */
> > buf[0] = 0;
> > - mask = PORT_CSC;
> >
> > spin_lock_irqsave(&priv->lock, flags);
> > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> >
> > - if (temp & PORT_OWNER) {
> > - if (temp & PORT_CSC) {
> > - temp &= ~PORT_CSC;
> > - reg_write32(hcd->regs, HC_PORTSC1, temp);
> > - goto done;
> > - }
> > + if (isp1760_hcd_is_set(hcd, PORT_OWNER) &&
> > + isp1760_hcd_is_set(hcd, PORT_CSC)) {
> > + isp1760_hcd_clear(hcd, PORT_CSC);
> > + goto done;
> > }
> >
> > /*
> > @@ -1735,11 +1775,9 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > * high-speed device is switched over to the companion
> > * controller by the user.
> > */
> > -
> > - if ((temp & mask) != 0
> > - || ((temp & PORT_RESUME) != 0
> > - && time_after_eq(jiffies,
> > - priv->reset_done))) {
> > + if (isp1760_hcd_is_set(hcd, PORT_CSC) ||
> > + (isp1760_hcd_is_set(hcd, PORT_RESUME) &&
> > + time_after_eq(jiffies, priv->reset_done))) {
> > buf [0] |= 1 << (0 + 1);
> > status = STS_PCD;
> > }
> > @@ -1752,9 +1790,11 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > struct usb_hub_descriptor *desc)
> > {
> > - int ports = HCS_N_PORTS(priv->hcs_params);
> > + int ports;
> > u16 temp;
> >
> > + ports = isp1760_hcd_read(priv->hcd, HCS_N_PORTS);
> > +
> > desc->bDescriptorType = USB_DT_HUB;
> > /* priv 1.0, 2.3.9 says 20ms max */
> > desc->bPwrOn2PwrGood = 10;
> > @@ -1770,7 +1810,7 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> >
> > /* per-port overcurrent reporting */
> > temp = HUB_CHAR_INDV_PORT_OCPM;
> > - if (HCS_PPC(priv->hcs_params))
> > + if (isp1760_hcd_is_set(priv->hcd, HCS_PPC))
> > /* per-port power control */
> > temp |= HUB_CHAR_INDV_PORT_LPSM;
> > else
> > @@ -1781,38 +1821,37 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> >
> > #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)
> >
> > -static int check_reset_complete(struct usb_hcd *hcd, int index,
> > - int port_status)
> > +static void check_reset_complete(struct usb_hcd *hcd, int index)
> > {
> > - if (!(port_status & PORT_CONNECT))
> > - return port_status;
> > + if (!(isp1760_hcd_is_set(hcd, PORT_CONNECT)))
> > + return;
> >
> > /* if reset finished and it's still not enabled -- handoff */
> > - if (!(port_status & PORT_PE)) {
> > -
> > + if (!isp1760_hcd_is_set(hcd, PORT_PE)) {
> > dev_info(hcd->self.controller,
> > "port %d full speed --> companion\n",
> > index + 1);
> >
> > - port_status |= PORT_OWNER;
> > - port_status &= ~PORT_RWC_BITS;
> > - reg_write32(hcd->regs, HC_PORTSC1, port_status);
> > + isp1760_hcd_set(hcd, PORT_OWNER);
> >
> > + isp1760_hcd_clear(hcd, PORT_CSC);
> > } else
> > dev_info(hcd->self.controller, "port %d high speed\n",
> > index + 1);
> >
> > - return port_status;
> > + return;
> > }
> >
> > static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > u16 wValue, u16 wIndex, char *buf, u16 wLength)
> > {
> > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > - int ports = HCS_N_PORTS(priv->hcs_params);
> > - u32 temp, status;
> > + u32 status;
> > unsigned long flags;
> > int retval = 0;
> > + int ports;
> > +
> > + ports = isp1760_hcd_read(hcd, HCS_N_PORTS);
> >
> > /*
> > * FIXME: support SetPortFeatures USB_PORT_FEAT_INDICATOR.
> > @@ -1837,7 +1876,6 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > if (!wIndex || wIndex > ports)
> > goto error;
> > wIndex--;
> > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> >
> > /*
> > * Even if OWNER is set, so the port is owned by the
> > @@ -1848,22 +1886,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> >
> > switch (wValue) {
> > case USB_PORT_FEAT_ENABLE:
> > - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_PE);
> > + isp1760_hcd_clear(hcd, PORT_PE);
> > break;
> > case USB_PORT_FEAT_C_ENABLE:
> > /* XXX error? */
> > break;
> > case USB_PORT_FEAT_SUSPEND:
> > - if (temp & PORT_RESET)
> > + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> > goto error;
> >
> > - if (temp & PORT_SUSPEND) {
> > - if ((temp & PORT_PE) == 0)
> > + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND)) {
> > + if (!isp1760_hcd_is_set(hcd, PORT_PE))
> > goto error;
> > /* resume signaling for 20 msec */
> > - temp &= ~(PORT_RWC_BITS);
> > - reg_write32(hcd->regs, HC_PORTSC1,
> > - temp | PORT_RESUME);
> > + isp1760_hcd_clear(hcd, PORT_CSC);
> > + isp1760_hcd_set(hcd, PORT_RESUME);
> > +
> > priv->reset_done = jiffies +
> > msecs_to_jiffies(USB_RESUME_TIMEOUT);
> > }
> > @@ -1872,12 +1910,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > /* we auto-clear this feature */
> > break;
> > case USB_PORT_FEAT_POWER:
> > - if (HCS_PPC(priv->hcs_params))
> > - reg_write32(hcd->regs, HC_PORTSC1,
> > - temp & ~PORT_POWER);
> > + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> > + isp1760_hcd_clear(hcd, PORT_POWER);
> > break;
> > case USB_PORT_FEAT_C_CONNECTION:
> > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_CSC);
> > + isp1760_hcd_set(hcd, PORT_CSC);
> > break;
> > case USB_PORT_FEAT_C_OVER_CURRENT:
> > /* XXX error ?*/
> > @@ -1888,7 +1925,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > default:
> > goto error;
> > }
> > - reg_read32(hcd->regs, HC_USBCMD);
> > + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> > break;
> > case GetHubDescriptor:
> > isp1760_hub_descriptor(priv, (struct usb_hub_descriptor *)
> > @@ -1903,15 +1940,14 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > goto error;
> > wIndex--;
> > status = 0;
> > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> >
> > /* wPortChange bits */
> > - if (temp & PORT_CSC)
> > + if (isp1760_hcd_is_set(hcd, PORT_CSC))
> > status |= USB_PORT_STAT_C_CONNECTION << 16;
> >
> >
> > /* whoever resumes must GetPortStatus to complete it!! */
> > - if (temp & PORT_RESUME) {
> > + if (isp1760_hcd_is_set(hcd, PORT_RESUME)) {
> > dev_err(hcd->self.controller, "Port resume should be skipped.\n");
> >
> > /* Remote Wakeup received? */
> > @@ -1930,35 +1966,31 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > priv->reset_done = 0;
> >
> > /* stop resume signaling */
> > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > - reg_write32(hcd->regs, HC_PORTSC1,
> > - temp & ~(PORT_RWC_BITS | PORT_RESUME));
> > - retval = handshake(hcd, HC_PORTSC1,
> > - PORT_RESUME, 0, 2000 /* 2msec */);
> > + isp1760_hcd_clear(hcd, PORT_CSC);
> > +
> > + retval = isp1760_hcd_clear_poll_timeout(hcd,
> > + PORT_RESUME, 2000);
> > if (retval != 0) {
> > dev_err(hcd->self.controller,
> > "port %d resume error %d\n",
> > wIndex + 1, retval);
> > goto error;
> > }
> > - temp &= ~(PORT_SUSPEND|PORT_RESUME|(3<<10));
> > }
> > }
> >
> > /* whoever resets must GetPortStatus to complete it!! */
> > - if ((temp & PORT_RESET)
> > - && time_after_eq(jiffies,
> > - priv->reset_done)) {
> > + if (isp1760_hcd_is_set(hcd, PORT_RESET) &&
> > + time_after_eq(jiffies, priv->reset_done)) {
> > status |= USB_PORT_STAT_C_RESET << 16;
> > priv->reset_done = 0;
> >
> > /* force reset to complete */
> > - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_RESET);
> > /* REVISIT: some hardware needs 550+ usec to clear
> > * this bit; seems too long to spin routinely...
> > */
> > - retval = handshake(hcd, HC_PORTSC1,
> > - PORT_RESET, 0, 750);
> > + retval = isp1760_hcd_clear_poll_timeout(hcd, PORT_RESET,
> > + 750);
> > if (retval != 0) {
> > dev_err(hcd->self.controller, "port %d reset error %d\n",
> > wIndex + 1, retval);
> > @@ -1966,8 +1998,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > }
> >
> > /* see what we found out */
> > - temp = check_reset_complete(hcd, wIndex,
> > - reg_read32(hcd->regs, HC_PORTSC1));
> > + check_reset_complete(hcd, wIndex);
> > }
> > /*
> > * Even if OWNER is set, there's no harm letting hub_wq
> > @@ -1975,21 +2006,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > * for PORT_POWER anyway).
> > */
> >
> > - if (temp & PORT_OWNER)
> > + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> > dev_err(hcd->self.controller, "PORT_OWNER is set\n");
> >
> > - if (temp & PORT_CONNECT) {
> > + if (isp1760_hcd_is_set(hcd, PORT_CONNECT)) {
> > status |= USB_PORT_STAT_CONNECTION;
> > /* status may be from integrated TT */
> > status |= USB_PORT_STAT_HIGH_SPEED;
> > }
> > - if (temp & PORT_PE)
> > + if (isp1760_hcd_is_set(hcd, PORT_PE))
> > status |= USB_PORT_STAT_ENABLE;
> > - if (temp & (PORT_SUSPEND|PORT_RESUME))
> > + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND) &&
> > + isp1760_hcd_is_set(hcd, PORT_RESUME))
> > status |= USB_PORT_STAT_SUSPEND;
> > - if (temp & PORT_RESET)
> > + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> > status |= USB_PORT_STAT_RESET;
> > - if (temp & PORT_POWER)
> > + if (isp1760_hcd_is_set(hcd, PORT_POWER))
> > status |= USB_PORT_STAT_POWER;
> >
> > put_unaligned(cpu_to_le32(status), (__le32 *) buf);
> > @@ -2009,41 +2041,39 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > if (!wIndex || wIndex > ports)
> > goto error;
> > wIndex--;
> > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > - if (temp & PORT_OWNER)
> > + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> > break;
> >
> > -/* temp &= ~PORT_RWC_BITS; */
> > switch (wValue) {
> > case USB_PORT_FEAT_ENABLE:
> > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_PE);
> > + isp1760_hcd_set(hcd, PORT_PE);
> > break;
> >
> > case USB_PORT_FEAT_SUSPEND:
> > - if ((temp & PORT_PE) == 0
> > - || (temp & PORT_RESET) != 0)
> > + if (!isp1760_hcd_is_set(hcd, PORT_PE) ||
> > + isp1760_hcd_is_set(hcd, PORT_RESET))
> > goto error;
> >
> > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_SUSPEND);
> > + isp1760_hcd_set(hcd, PORT_SUSPEND);
> > break;
> > case USB_PORT_FEAT_POWER:
> > - if (HCS_PPC(priv->hcs_params))
> > - reg_write32(hcd->regs, HC_PORTSC1,
> > - temp | PORT_POWER);
> > + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> > + isp1760_hcd_set(hcd, PORT_POWER);
> > break;
> > case USB_PORT_FEAT_RESET:
> > - if (temp & PORT_RESUME)
> > + if (isp1760_hcd_is_set(hcd, PORT_RESUME))
> > goto error;
> > /* line status bits may report this as low speed,
> > * which can be fine if this root hub has a
> > * transaction translator built in.
> > */
> > - if ((temp & (PORT_PE|PORT_CONNECT)) == PORT_CONNECT
> > - && PORT_USB11(temp)) {
> > - temp |= PORT_OWNER;
> > + if ((isp1760_hcd_is_set(hcd, PORT_CONNECT) &&
> > + !isp1760_hcd_is_set(hcd, PORT_PE)) &&
> > + (isp1760_hcd_read(hcd, PORT_LSTATUS) == 1)) {
> > + isp1760_hcd_set(hcd, PORT_OWNER);
> > } else {
> > - temp |= PORT_RESET;
> > - temp &= ~PORT_PE;
> > + isp1760_hcd_set(hcd, PORT_RESET);
> > + isp1760_hcd_clear(hcd, PORT_PE);
> >
> > /*
> > * caller must wait, then call GetPortStatus
> > @@ -2052,12 +2082,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > priv->reset_done = jiffies +
> > msecs_to_jiffies(50);
> > }
> > - reg_write32(hcd->regs, HC_PORTSC1, temp);
> > break;
> > default:
> > goto error;
> > }
> > - reg_read32(hcd->regs, HC_USBCMD);
> > + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> > break;
> >
> > default:
> > @@ -2074,14 +2103,13 @@ static int isp1760_get_frame(struct usb_hcd *hcd)
> > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > u32 fr;
> >
> > - fr = reg_read32(hcd->regs, HC_FRINDEX);
> > + fr = isp1760_hcd_read(hcd, HC_FRINDEX);
> > return (fr >> 3) % priv->periodic_size;
> > }
> >
> > static void isp1760_stop(struct usb_hcd *hcd)
> > {
> > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > - u32 temp;
> >
> > del_timer(&errata2_timer);
> >
> > @@ -2092,24 +2120,19 @@ static void isp1760_stop(struct usb_hcd *hcd)
> > spin_lock_irq(&priv->lock);
> > ehci_reset(hcd);
> > /* Disable IRQ */
> > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
> > + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> > spin_unlock_irq(&priv->lock);
> >
> > - reg_write32(hcd->regs, HC_CONFIGFLAG, 0);
> > + isp1760_hcd_clear(hcd, FLAG_CF);
> > }
> >
> > static void isp1760_shutdown(struct usb_hcd *hcd)
> > {
> > - u32 command, temp;
> > -
> > isp1760_stop(hcd);
> > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
> >
> > - command = reg_read32(hcd->regs, HC_USBCMD);
> > - command &= ~CMD_RUN;
> > - reg_write32(hcd->regs, HC_USBCMD, command);
> > + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> > +
> > + isp1760_hcd_clear(hcd, CMD_RUN);
> > }
> >
> > static void isp1760_clear_tt_buffer_complete(struct usb_hcd *hcd,
> > @@ -2182,8 +2205,8 @@ void isp1760_deinit_kmem_cache(void)
> > kmem_cache_destroy(urb_listitem_cachep);
> > }
> >
> > -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > - struct resource *mem, int irq, unsigned long irqflags,
> > +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> > + int irq, unsigned long irqflags,
> > struct device *dev)
> > {
> > struct usb_hcd *hcd;
> > @@ -2200,7 +2223,6 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > init_memory(priv);
> >
> > hcd->irq = irq;
> > - hcd->regs = regs;
> > hcd->rsrc_start = mem->start;
> > hcd->rsrc_len = resource_size(mem);
> >
> > diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
> > index f1bb2deb1ccf..34e1899e52c4 100644
> > --- a/drivers/usb/isp1760/isp1760-hcd.h
> > +++ b/drivers/usb/isp1760/isp1760-hcd.h
> > @@ -3,6 +3,9 @@
> > #define _ISP1760_HCD_H_
> >
> > #include <linux/spinlock.h>
> > +#include <linux/regmap.h>
> > +
> > +#include "isp1760-regs.h"
> >
> > struct isp1760_qh;
> > struct isp1760_qtd;
> > @@ -48,10 +51,13 @@ enum isp1760_queue_head_types {
> > };
> >
> > struct isp1760_hcd {
> > -#ifdef CONFIG_USB_ISP1760_HCD
> > struct usb_hcd *hcd;
> >
> > - u32 hcs_params;
> > + void __iomem *base;
> > +
> > + struct regmap *regs;
> > + struct regmap_field *fields[HC_FIELD_MAX];
> > +
> > spinlock_t lock;
> > struct isp1760_slotinfo atl_slots[32];
> > int atl_done_map;
> > @@ -66,20 +72,18 @@ struct isp1760_hcd {
> > unsigned i_thresh;
> > unsigned long reset_done;
> > unsigned long next_statechange;
> > -#endif
> > };
> >
> > #ifdef CONFIG_USB_ISP1760_HCD
> > -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > - struct resource *mem, int irq, unsigned long irqflags,
> > - struct device *dev);
> > +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> > + int irq, unsigned long irqflags, struct device *dev);
> > void isp1760_hcd_unregister(struct isp1760_hcd *priv);
> >
> > int isp1760_init_kmem_once(void);
> > void isp1760_deinit_kmem_cache(void);
> > #else
> > static inline int isp1760_hcd_register(struct isp1760_hcd *priv,
> > - void __iomem *regs, struct resource *mem,
> > + struct resource *mem,
> > int irq, unsigned long irqflags,
> > struct device *dev)
> > {
> > diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
> > index ccd30f835888..abfba9f5ec23 100644
> > --- a/drivers/usb/isp1760/isp1760-if.c
> > +++ b/drivers/usb/isp1760/isp1760-if.c
> > @@ -75,9 +75,9 @@ static int isp1761_pci_init(struct pci_dev *dev)
> > /*by default host is in 16bit mode, so
> > * io operations at this stage must be 16 bit
> > * */
> > - writel(0xface, iobase + HC_SCRATCH_REG);
> > + writel(0xface, iobase + ISP176x_HC_SCRATCH);
> > udelay(100);
> > - reg_data = readl(iobase + HC_SCRATCH_REG) & 0x0000ffff;
> > + reg_data = readl(iobase + ISP176x_HC_SCRATCH) & 0x0000ffff;
> > retry_count--;
> > }
> >
> > diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
> > index fedc4f5cded0..42ee4404c90b 100644
> > --- a/drivers/usb/isp1760/isp1760-regs.h
> > +++ b/drivers/usb/isp1760/isp1760-regs.h
> > @@ -10,218 +10,286 @@
> > * Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > */
> >
> > -#ifndef _ISP1760_REGS_H_
> > -#define _ISP1760_REGS_H_
> > +#ifndef _ISP176x_REGS_H_
> > +#define _ISP176x_REGS_H_
> > +
> > +#include <linux/regmap.h>
> >
> > /* -----------------------------------------------------------------------------
> > * Host Controller
> > */
> >
> > /* EHCI capability registers */
> > -#define HC_CAPLENGTH 0x000
> > -#define HC_LENGTH(p) (((p) >> 00) & 0x00ff) /* bits 7:0 */
> > -#define HC_VERSION(p) (((p) >> 16) & 0xffff) /* bits 31:16 */
> > -
> > -#define HC_HCSPARAMS 0x004
> > -#define HCS_INDICATOR(p) ((p) & (1 << 16)) /* true: has port indicators */
> > -#define HCS_PPC(p) ((p) & (1 << 4)) /* true: port power control */
> > -#define HCS_N_PORTS(p) (((p) >> 0) & 0xf) /* bits 3:0, ports on HC */
> > -
> > -#define HC_HCCPARAMS 0x008
> > -#define HCC_ISOC_CACHE(p) ((p) & (1 << 7)) /* true: can cache isoc frame */
> > -#define HCC_ISOC_THRES(p) (((p) >> 4) & 0x7) /* bits 6:4, uframes cached */
> > +#define ISP176x_HC_CAPLENGTH 0x000
> > +#define ISP176x_HC_VERSION 0x002
> > +#define ISP176x_HC_HCSPARAMS 0x004
> > +#define ISP176x_HC_HCCPARAMS 0x008
> >
> > /* EHCI operational registers */
> > -#define HC_USBCMD 0x020
> > -#define CMD_LRESET (1 << 7) /* partial reset (no ports, etc) */
> > -#define CMD_RESET (1 << 1) /* reset HC not bus */
> > -#define CMD_RUN (1 << 0) /* start/stop HC */
> > -
> > -#define HC_USBSTS 0x024
> > -#define STS_PCD (1 << 2) /* port change detect */
> > -
> > -#define HC_FRINDEX 0x02c
> > -
> > -#define HC_CONFIGFLAG 0x060
> > -#define FLAG_CF (1 << 0) /* true: we'll support "high speed" */
> > -
> > -#define HC_PORTSC1 0x064
> > -#define PORT_OWNER (1 << 13) /* true: companion hc owns this port */
> > -#define PORT_POWER (1 << 12) /* true: has power (see PPC) */
> > -#define PORT_USB11(x) (((x) & (3 << 10)) == (1 << 10)) /* USB 1.1 device */
> > -#define PORT_RESET (1 << 8) /* reset port */
> > -#define PORT_SUSPEND (1 << 7) /* suspend port */
> > -#define PORT_RESUME (1 << 6) /* resume it */
> > -#define PORT_PE (1 << 2) /* port enable */
> > -#define PORT_CSC (1 << 1) /* connect status change */
> > -#define PORT_CONNECT (1 << 0) /* device connected */
> > -#define PORT_RWC_BITS (PORT_CSC)
> > -
> > -#define HC_ISO_PTD_DONEMAP_REG 0x130
> > -#define HC_ISO_PTD_SKIPMAP_REG 0x134
> > -#define HC_ISO_PTD_LASTPTD_REG 0x138
> > -#define HC_INT_PTD_DONEMAP_REG 0x140
> > -#define HC_INT_PTD_SKIPMAP_REG 0x144
> > -#define HC_INT_PTD_LASTPTD_REG 0x148
> > -#define HC_ATL_PTD_DONEMAP_REG 0x150
> > -#define HC_ATL_PTD_SKIPMAP_REG 0x154
> > -#define HC_ATL_PTD_LASTPTD_REG 0x158
> > +#define ISP176x_HC_USBCMD 0x020
> > +#define ISP176x_HC_USBSTS 0x024
> > +#define ISP176x_HC_FRINDEX 0x02c
> > +
> > +#define ISP176x_HC_CONFIGFLAG 0x060
> > +#define ISP176x_HC_PORTSC1 0x064
> > +
> > +#define ISP176x_HC_ISO_PTD_DONEMAP 0x130
> > +#define ISP176x_HC_ISO_PTD_SKIPMAP 0x134
> > +#define ISP176x_HC_ISO_PTD_LASTPTD 0x138
> > +#define ISP176x_HC_INT_PTD_DONEMAP 0x140
> > +#define ISP176x_HC_INT_PTD_SKIPMAP 0x144
> > +#define ISP176x_HC_INT_PTD_LASTPTD 0x148
> > +#define ISP176x_HC_ATL_PTD_DONEMAP 0x150
> > +#define ISP176x_HC_ATL_PTD_SKIPMAP 0x154
> > +#define ISP176x_HC_ATL_PTD_LASTPTD 0x158
> >
> > /* Configuration Register */
> > -#define HC_HW_MODE_CTRL 0x300
> > -#define ALL_ATX_RESET (1 << 31)
> > -#define HW_ANA_DIGI_OC (1 << 15)
> > -#define HW_DEV_DMA (1 << 11)
> > -#define HW_COMN_IRQ (1 << 10)
> > -#define HW_COMN_DMA (1 << 9)
> > -#define HW_DATA_BUS_32BIT (1 << 8)
> > -#define HW_DACK_POL_HIGH (1 << 6)
> > -#define HW_DREQ_POL_HIGH (1 << 5)
> > -#define HW_INTR_HIGH_ACT (1 << 2)
> > -#define HW_INTR_EDGE_TRIG (1 << 1)
> > -#define HW_GLOBAL_INTR_EN (1 << 0)
> > -
> > -#define HC_CHIP_ID_REG 0x304
> > -#define HC_SCRATCH_REG 0x308
> > -
> > -#define HC_RESET_REG 0x30c
> > -#define SW_RESET_RESET_HC (1 << 1)
> > -#define SW_RESET_RESET_ALL (1 << 0)
> > -
> > -#define HC_BUFFER_STATUS_REG 0x334
> > -#define ISO_BUF_FILL (1 << 2)
> > -#define INT_BUF_FILL (1 << 1)
> > -#define ATL_BUF_FILL (1 << 0)
> > -
> > -#define HC_MEMORY_REG 0x33c
> > -#define ISP_BANK(x) ((x) << 16)
> > -
> > -#define HC_PORT1_CTRL 0x374
> > -#define PORT1_POWER (3 << 3)
> > -#define PORT1_INIT1 (1 << 7)
> > -#define PORT1_INIT2 (1 << 23)
> > -#define HW_OTG_CTRL_SET 0x374
> > -#define HW_OTG_CTRL_CLR 0x376
> > -#define HW_OTG_DISABLE (1 << 10)
> > -#define HW_OTG_SE0_EN (1 << 9)
> > -#define HW_BDIS_ACON_EN (1 << 8)
> > -#define HW_SW_SEL_HC_DC (1 << 7)
> > -#define HW_VBUS_CHRG (1 << 6)
> > -#define HW_VBUS_DISCHRG (1 << 5)
> > -#define HW_VBUS_DRV (1 << 4)
> > -#define HW_SEL_CP_EXT (1 << 3)
> > -#define HW_DM_PULLDOWN (1 << 2)
> > -#define HW_DP_PULLDOWN (1 << 1)
> > -#define HW_DP_PULLUP (1 << 0)
> > +#define ISP176x_HC_HW_MODE_CTRL 0x300
> > +#define ISP176x_HC_CHIP_ID 0x304
> > +#define ISP176x_HC_SCRATCH 0x308
> > +#define ISP176x_HC_RESET 0x30c
> > +#define ISP176x_HC_BUFFER_STATUS 0x334
> > +#define ISP176x_HC_MEMORY 0x33c
> >
> > /* Interrupt Register */
> > -#define HC_INTERRUPT_REG 0x310
> > -
> > -#define HC_INTERRUPT_ENABLE 0x314
> > -#define HC_ISO_INT (1 << 9)
> > -#define HC_ATL_INT (1 << 8)
> > -#define HC_INTL_INT (1 << 7)
> > -#define HC_EOT_INT (1 << 3)
> > -#define HC_SOT_INT (1 << 1)
> > -#define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT)
> > -
> > -#define HC_ISO_IRQ_MASK_OR_REG 0x318
> > -#define HC_INT_IRQ_MASK_OR_REG 0x31c
> > -#define HC_ATL_IRQ_MASK_OR_REG 0x320
> > -#define HC_ISO_IRQ_MASK_AND_REG 0x324
> > -#define HC_INT_IRQ_MASK_AND_REG 0x328
> > -#define HC_ATL_IRQ_MASK_AND_REG 0x32c
> > +#define ISP176x_HC_INTERRUPT 0x310
> > +#define ISP176x_HC_INTERRUPT_ENABLE 0x314
> > +#define ISP176x_HC_ISO_IRQ_MASK_OR 0x318
> > +#define ISP176x_HC_INT_IRQ_MASK_OR 0x31c
> > +#define ISP176x_HC_ATL_IRQ_MASK_OR 0x320
> > +#define ISP176x_HC_ISO_IRQ_MASK_AND 0x324
> > +#define ISP176x_HC_INT_IRQ_MASK_AND 0x328
> > +#define ISP176x_HC_ATL_IRQ_MASK_AND 0x32c
> > +
> > +static const struct regmap_range isp176x_hc_volatile_ranges[] = {
> > + regmap_reg_range(ISP176x_HC_USBCMD, ISP176x_HC_ATL_PTD_LASTPTD),
> > + regmap_reg_range(ISP176x_HC_BUFFER_STATUS, ISP176x_HC_MEMORY),
> > + regmap_reg_range(ISP176x_HC_INTERRUPT, ISP176x_HC_ATL_IRQ_MASK_AND),
> > +};
> > +
> > +static const struct regmap_access_table isp176x_hc_volatile_table = {
> > + .yes_ranges = isp176x_hc_volatile_ranges,
> > + .n_yes_ranges = ARRAY_SIZE(isp176x_hc_volatile_ranges),
> > +};
>
> These belong to a .c file.
yup, can move them and all below.
>
> > +
> > +enum isp176x_host_controller_fields {
> > + /* HC_HCSPARAMS */
> > + HCS_PPC, HCS_N_PORTS,
> > + /* HC_HCCPARAMS */
> > + HCC_ISOC_CACHE, HCC_ISOC_THRES,
> > + /* HC_USBCMD */
> > + CMD_LRESET, CMD_RESET, CMD_RUN,
> > + /* HC_USBSTS */
> > + STS_PCD,
> > + /* HC_FRINDEX */
> > + HC_FRINDEX,
> > + /* HC_CONFIGFLAG */
> > + FLAG_CF,
> > + /* HC_PORTSC1 */
> > + PORT_OWNER, PORT_POWER, PORT_LSTATUS, PORT_RESET, PORT_SUSPEND,
> > + PORT_RESUME, PORT_PE, PORT_CSC, PORT_CONNECT,
> > + /* HC_HW_MODE_CTRL */
> > + ALL_ATX_RESET, HW_ANA_DIGI_OC, HW_DEV_DMA, HW_COMN_IRQ, HW_COMN_DMA,
> > + HW_DATA_BUS_WIDTH, HW_DACK_POL_HIGH, HW_DREQ_POL_HIGH, HW_INTR_HIGH_ACT,
> > + HW_INTR_EDGE_TRIG, HW_GLOBAL_INTR_EN,
> > + /* HC_RESET */
> > + SW_RESET_RESET_HC, SW_RESET_RESET_ALL,
> > + /* HC_BUFFER_STATUS */
> > + INT_BUF_FILL, ATL_BUF_FILL,
> > + /* HC_MEMORY */
> > + MEM_BANK_SEL, MEM_START_ADDR,
> > + /* HC_INTERRUPT_ENABLE */
> > + HC_INT_ENABLE,
> > + /* Last element */
> > + HC_FIELD_MAX,
> > +};
> > +
> > +static const struct reg_field isp1760_hc_reg_fields[] = {
> > + [HCS_PPC] = REG_FIELD(ISP176x_HC_HCSPARAMS, 4, 4),
> > + [HCS_N_PORTS] = REG_FIELD(ISP176x_HC_HCSPARAMS, 0, 3),
> > + [HCC_ISOC_CACHE] = REG_FIELD(ISP176x_HC_HCCPARAMS, 7, 7),
> > + [HCC_ISOC_THRES] = REG_FIELD(ISP176x_HC_HCCPARAMS, 4, 6),
> > + [CMD_LRESET] = REG_FIELD(ISP176x_HC_USBCMD, 7, 7),
> > + [CMD_RESET] = REG_FIELD(ISP176x_HC_USBCMD, 1, 1),
> > + [CMD_RUN] = REG_FIELD(ISP176x_HC_USBCMD, 0, 0),
> > + [STS_PCD] = REG_FIELD(ISP176x_HC_USBSTS, 2, 2),
> > + [HC_FRINDEX] = REG_FIELD(ISP176x_HC_FRINDEX, 0, 13),
> > + [FLAG_CF] = REG_FIELD(ISP176x_HC_CONFIGFLAG, 0, 0),
> > + [PORT_OWNER] = REG_FIELD(ISP176x_HC_PORTSC1, 13, 13),
> > + [PORT_POWER] = REG_FIELD(ISP176x_HC_PORTSC1, 12, 12),
> > + [PORT_LSTATUS] = REG_FIELD(ISP176x_HC_PORTSC1, 10, 11),
> > + [PORT_RESET] = REG_FIELD(ISP176x_HC_PORTSC1, 8, 8),
> > + [PORT_SUSPEND] = REG_FIELD(ISP176x_HC_PORTSC1, 7, 7),
> > + [PORT_RESUME] = REG_FIELD(ISP176x_HC_PORTSC1, 6, 6),
> > + [PORT_PE] = REG_FIELD(ISP176x_HC_PORTSC1, 2, 2),
> > + [PORT_CSC] = REG_FIELD(ISP176x_HC_PORTSC1, 1, 1),
> > + [PORT_CONNECT] = REG_FIELD(ISP176x_HC_PORTSC1, 0, 0),
> > + [ALL_ATX_RESET] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 31, 31),
> > + [HW_ANA_DIGI_OC] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 15, 15),
> > + [HW_COMN_IRQ] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 10, 10),
> > + [HW_DATA_BUS_WIDTH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 8, 8),
> > + [HW_DACK_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 6, 6),
> > + [HW_DREQ_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 5, 5),
> > + [HW_INTR_HIGH_ACT] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 2, 2),
> > + [HW_INTR_EDGE_TRIG] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 1, 1),
> > + [HW_GLOBAL_INTR_EN] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 0, 0),
> > + [SW_RESET_RESET_ALL] = REG_FIELD(ISP176x_HC_RESET, 0, 0),
> > + [INT_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 1, 1),
> > + [ATL_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 0, 0),
> > + [MEM_BANK_SEL] = REG_FIELD(ISP176x_HC_MEMORY, 16, 17),
> > + [MEM_START_ADDR] = REG_FIELD(ISP176x_HC_MEMORY, 0, 15),
> > + [HC_INT_ENABLE] = REG_FIELD(ISP176x_HC_INTERRUPT_ENABLE, 7, 8),
> > +};
>
> This too.
>
> >
> > /* -----------------------------------------------------------------------------
> > * Peripheral Controller
> > */
> >
> > -/* Initialization Registers */
> > -#define DC_ADDRESS 0x0200
> > -#define DC_DEVEN (1 << 7)
> > -
> > -#define DC_MODE 0x020c
> > -#define DC_DMACLKON (1 << 9)
> > -#define DC_VBUSSTAT (1 << 8)
> > -#define DC_CLKAON (1 << 7)
> > -#define DC_SNDRSU (1 << 6)
> > -#define DC_GOSUSP (1 << 5)
> > -#define DC_SFRESET (1 << 4)
> > -#define DC_GLINTENA (1 << 3)
> > -#define DC_WKUPCS (1 << 2)
> > -
> > -#define DC_INTCONF 0x0210
> > -#define DC_CDBGMOD_ACK_NAK (0 << 6)
> > -#define DC_CDBGMOD_ACK (1 << 6)
> > -#define DC_CDBGMOD_ACK_1NAK (2 << 6)
> > -#define DC_DDBGMODIN_ACK_NAK (0 << 4)
> > -#define DC_DDBGMODIN_ACK (1 << 4)
> > -#define DC_DDBGMODIN_ACK_1NAK (2 << 4)
> > -#define DC_DDBGMODOUT_ACK_NYET_NAK (0 << 2)
> > -#define DC_DDBGMODOUT_ACK_NYET (1 << 2)
> > -#define DC_DDBGMODOUT_ACK_NYET_1NAK (2 << 2)
> > -#define DC_INTLVL (1 << 1)
> > -#define DC_INTPOL (1 << 0)
> > -
> > -#define DC_DEBUG 0x0212
> > -#define DC_INTENABLE 0x0214
> > #define DC_IEPTX(n) (1 << (11 + 2 * (n)))
> > #define DC_IEPRX(n) (1 << (10 + 2 * (n)))
> > #define DC_IEPRXTX(n) (3 << (10 + 2 * (n)))
> > -#define DC_IEP0SETUP (1 << 8)
> > -#define DC_IEVBUS (1 << 7)
> > -#define DC_IEDMA (1 << 6)
> > -#define DC_IEHS_STA (1 << 5)
> > -#define DC_IERESM (1 << 4)
> > -#define DC_IESUSP (1 << 3)
> > -#define DC_IEPSOF (1 << 2)
> > -#define DC_IESOF (1 << 1)
> > -#define DC_IEBRST (1 << 0)
> > +
> > +#define ISP176x_DC_ENDPTYP_ISOC 0x01
> > +#define ISP176x_DC_ENDPTYP_BULK 0x02
> > +#define ISP176x_DC_ENDPTYP_INTERRUPT 0x03
> > +
> > +/* Initialization Registers */
> > +#define ISP176x_DC_ADDRESS 0x0200
> > +#define ISP176x_DC_MODE 0x020c
> > +#define ISP176x_DC_INTCONF 0x0210
> > +#define ISP176x_DC_DEBUG 0x0212
> > +#define ISP176x_DC_INTENABLE 0x0214
> >
> > /* Data Flow Registers */
> > -#define DC_EPINDEX 0x022c
> > -#define DC_EP0SETUP (1 << 5)
> > -#define DC_ENDPIDX(n) ((n) << 1)
> > -#define DC_EPDIR (1 << 0)
> > -
> > -#define DC_CTRLFUNC 0x0228
> > -#define DC_CLBUF (1 << 4)
> > -#define DC_VENDP (1 << 3)
> > -#define DC_DSEN (1 << 2)
> > -#define DC_STATUS (1 << 1)
> > -#define DC_STALL (1 << 0)
> > -
> > -#define DC_DATAPORT 0x0220
> > -#define DC_BUFLEN 0x021c
> > -#define DC_DATACOUNT_MASK 0xffff
> > -#define DC_BUFSTAT 0x021e
> > -#define DC_EPMAXPKTSZ 0x0204
> > -
> > -#define DC_EPTYPE 0x0208
> > -#define DC_NOEMPKT (1 << 4)
> > -#define DC_EPENABLE (1 << 3)
> > -#define DC_DBLBUF (1 << 2)
> > -#define DC_ENDPTYP_ISOC (1 << 0)
> > -#define DC_ENDPTYP_BULK (2 << 0)
> > -#define DC_ENDPTYP_INTERRUPT (3 << 0)
> > +#define ISP176x_DC_EPMAXPKTSZ 0x0204
> > +#define ISP176x_DC_EPTYPE 0x0208
> > +
> > +#define ISP176x_DC_BUFLEN 0x021c
> > +#define ISP176x_DC_BUFSTAT 0x021e
> > +#define ISP176x_DC_DATAPORT 0x0220
> > +
> > +#define ISP176x_DC_CTRLFUNC 0x0228
> > +#define ISP176x_DC_EPINDEX 0x022c
> > +
> > +#define ISP1761_DC_OTG_CTRL_SET 0x374
> > +#define ISP1761_DC_OTG_CTRL_CLEAR 0x376
> >
> > /* DMA Registers */
> > -#define DC_DMACMD 0x0230
> > -#define DC_DMATXCOUNT 0x0234
> > -#define DC_DMACONF 0x0238
> > -#define DC_DMAHW 0x023c
> > -#define DC_DMAINTREASON 0x0250
> > -#define DC_DMAINTEN 0x0254
> > -#define DC_DMAEP 0x0258
> > -#define DC_DMABURSTCOUNT 0x0264
> > +#define ISP176x_DC_DMACMD 0x0230
> > +#define ISP176x_DC_DMATXCOUNT 0x0234
> > +#define ISP176x_DC_DMACONF 0x0238
> > +#define ISP176x_DC_DMAHW 0x023c
> > +#define ISP176x_DC_DMAINTREASON 0x0250
> > +#define ISP176x_DC_DMAINTEN 0x0254
> > +#define ISP176x_DC_DMAEP 0x0258
> > +#define ISP176x_DC_DMABURSTCOUNT 0x0264
> >
> > /* General Registers */
> > -#define DC_INTERRUPT 0x0218
> > -#define DC_CHIPID 0x0270
> > -#define DC_FRAMENUM 0x0274
> > -#define DC_SCRATCH 0x0278
> > -#define DC_UNLOCKDEV 0x027c
> > -#define DC_INTPULSEWIDTH 0x0280
> > -#define DC_TESTMODE 0x0284
> > +#define ISP176x_DC_INTERRUPT 0x0218
> > +#define ISP176x_DC_CHIPID 0x0270
> > +#define ISP176x_DC_FRAMENUM 0x0274
> > +#define ISP176x_DC_SCRATCH 0x0278
> > +#define ISP176x_DC_UNLOCKDEV 0x027c
> > +#define ISP176x_DC_INTPULSEWIDTH 0x0280
> > +#define ISP176x_DC_TESTMODE 0x0284
> > +
> > +static const struct regmap_range isp176x_dc_volatile_ranges[] = {
> > + regmap_reg_range(ISP176x_DC_EPMAXPKTSZ, ISP176x_DC_EPTYPE),
> > + regmap_reg_range(ISP176x_DC_BUFLEN, ISP176x_DC_EPINDEX),
> > + regmap_reg_range(ISP1761_DC_OTG_CTRL_SET, ISP1761_DC_OTG_CTRL_CLEAR),
> > +};
> > +
> > +static const struct regmap_access_table isp176x_dc_volatile_table = {
> > + .yes_ranges = isp176x_dc_volatile_ranges,
> > + .n_yes_ranges = ARRAY_SIZE(isp176x_dc_volatile_ranges),
> > +};
> > +
> > +enum isp176x_device_controller_fields {
> > + /* DC_ADDRESS */
> > + DC_DEVEN, DC_DEVADDR,
> > + /* DC_MODE */
> > + DC_VBUSSTAT, DC_SFRESET, DC_GLINTENA,
> > + /* DC_INTCONF */
> > + DC_CDBGMOD_ACK, DC_DDBGMODIN_ACK, DC_DDBGMODOUT_ACK, DC_INTPOL,
> > + /* DC_INTENABLE */
> > + DC_IEPRXTX_7, DC_IEPRXTX_6, DC_IEPRXTX_5, DC_IEPRXTX_4, DC_IEPRXTX_3,
> > + DC_IEPRXTX_2, DC_IEPRXTX_1, DC_IEPRXTX_0,
> > + DC_IEP0SETUP, DC_IEVBUS, DC_IEHS_STA, DC_IERESM, DC_IESUSP, DC_IEBRST,
> > + /* DC_EPINDEX */
> > + DC_EP0SETUP, DC_ENDPIDX, DC_EPDIR,
> > + /* DC_CTRLFUNC */
> > + DC_CLBUF, DC_VENDP, DC_DSEN, DC_STATUS, DC_STALL,
> > + /* DC_BUFLEN */
> > + DC_BUFLEN,
> > + /* DC_EPMAXPKTSZ */
> > + DC_FFOSZ,
> > + /* DC_EPTYPE */
> > + DC_EPENABLE, DC_ENDPTYP,
> > + /* DC_FRAMENUM */
> > + DC_FRAMENUM, DC_UFRAMENUM,
> > + /* HW_OTG_CTRL_SET */
> > + HW_OTG_DISABLE, HW_SW_SEL_HC_DC, HW_VBUS_DRV, HW_SEL_CP_EXT,
> > + HW_DM_PULLDOWN, HW_DP_PULLDOWN, HW_DP_PULLUP,
> > + /* HW_OTG_CTRL_CLR */
> > + HW_OTG_DISABLE_CLEAR, HW_SW_SEL_HC_DC_CLEAR, HW_VBUS_DRV_CLEAR,
> > + HW_SEL_CP_EXT_CLEAR, HW_DM_PULLDOWN_CLEAR, HW_DP_PULLDOWN_CLEAR,
> > + HW_DP_PULLUP_CLEAR,
> > + /* Last element */
> > + DC_FIELD_MAX,
> > +};
> > +
> > +static const struct reg_field isp1761_dc_reg_fields[] = {
> > + [DC_DEVEN] = REG_FIELD(ISP176x_DC_ADDRESS, 7, 7),
> > + [DC_DEVADDR] = REG_FIELD(ISP176x_DC_ADDRESS, 0, 6),
> > + [DC_VBUSSTAT] = REG_FIELD(ISP176x_DC_MODE, 8, 8),
> > + [DC_SFRESET] = REG_FIELD(ISP176x_DC_MODE, 4, 4),
> > + [DC_GLINTENA] = REG_FIELD(ISP176x_DC_MODE, 3, 3),
> > + [DC_CDBGMOD_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 6, 6),
> > + [DC_DDBGMODIN_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 4, 4),
> > + [DC_DDBGMODOUT_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 2, 2),
> > + [DC_INTPOL] = REG_FIELD(ISP176x_DC_INTCONF, 0, 0),
> > + [DC_IEPRXTX_7] = REG_FIELD(ISP176x_DC_INTENABLE, 25, 25),
> > + [DC_IEPRXTX_6] = REG_FIELD(ISP176x_DC_INTENABLE, 23, 23),
> > + [DC_IEPRXTX_5] = REG_FIELD(ISP176x_DC_INTENABLE, 21, 21),
> > + [DC_IEPRXTX_4] = REG_FIELD(ISP176x_DC_INTENABLE, 19, 19),
> > + [DC_IEPRXTX_3] = REG_FIELD(ISP176x_DC_INTENABLE, 17, 17),
> > + [DC_IEPRXTX_2] = REG_FIELD(ISP176x_DC_INTENABLE, 15, 15),
> > + [DC_IEPRXTX_1] = REG_FIELD(ISP176x_DC_INTENABLE, 13, 13),
> > + [DC_IEPRXTX_0] = REG_FIELD(ISP176x_DC_INTENABLE, 11, 11),
> > + [DC_IEP0SETUP] = REG_FIELD(ISP176x_DC_INTENABLE, 8, 8),
> > + [DC_IEVBUS] = REG_FIELD(ISP176x_DC_INTENABLE, 7, 7),
> > + [DC_IEHS_STA] = REG_FIELD(ISP176x_DC_INTENABLE, 5, 5),
> > + [DC_IERESM] = REG_FIELD(ISP176x_DC_INTENABLE, 4, 4),
> > + [DC_IESUSP] = REG_FIELD(ISP176x_DC_INTENABLE, 3, 3),
> > + [DC_IEBRST] = REG_FIELD(ISP176x_DC_INTENABLE, 0, 0),
> > + [DC_EP0SETUP] = REG_FIELD(ISP176x_DC_EPINDEX, 5, 5),
> > + [DC_ENDPIDX] = REG_FIELD(ISP176x_DC_EPINDEX, 1, 4),
> > + [DC_EPDIR] = REG_FIELD(ISP176x_DC_EPINDEX, 0, 0),
> > + [DC_CLBUF] = REG_FIELD(ISP176x_DC_CTRLFUNC, 4, 4),
> > + [DC_VENDP] = REG_FIELD(ISP176x_DC_CTRLFUNC, 3, 3),
> > + [DC_DSEN] = REG_FIELD(ISP176x_DC_CTRLFUNC, 2, 2),
> > + [DC_STATUS] = REG_FIELD(ISP176x_DC_CTRLFUNC, 1, 1),
> > + [DC_STALL] = REG_FIELD(ISP176x_DC_CTRLFUNC, 0, 0),
> > + [DC_BUFLEN] = REG_FIELD(ISP176x_DC_BUFLEN, 0, 15),
> > + [DC_FFOSZ] = REG_FIELD(ISP176x_DC_EPMAXPKTSZ, 0, 10),
> > + [DC_EPENABLE] = REG_FIELD(ISP176x_DC_EPTYPE, 3, 3),
> > + [DC_ENDPTYP] = REG_FIELD(ISP176x_DC_EPTYPE, 0, 1),
> > + [DC_UFRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 11, 13),
> > + [DC_FRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 0, 10),
> > + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 10, 10),
> > + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 7, 7),
> > + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 4, 4),
> > + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 3, 3),
> > + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 2, 2),
> > + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 1, 1),
> > + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 0, 0),
> > + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 10, 10),
> > + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 7, 7),
> > + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 4, 4),
> > + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 3, 3),
> > + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 2, 2),
> > + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 1, 1),
> > + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 0, 0),
> > +};
> >
> > #endif
> > diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
> > index 1714b2258b54..1ce21ef291b6 100644
> > --- a/drivers/usb/isp1760/isp1760-udc.c
> > +++ b/drivers/usb/isp1760/isp1760-udc.c
> > @@ -45,16 +45,62 @@ static inline struct isp1760_request *req_to_udc_req(struct usb_request *req)
> > return container_of(req, struct isp1760_request, req);
> > }
> >
> > -static inline u32 isp1760_udc_read(struct isp1760_udc *udc, u16 reg)
> > +static u32 isp1760_udc_read(struct isp1760_udc *udc, u16 field)
> > {
> > - return isp1760_read32(udc->regs, reg);
> > + return isp1760_field_read(udc->fields, field);
> > }
> >
> > -static inline void isp1760_udc_write(struct isp1760_udc *udc, u16 reg, u32 val)
> > +static void isp1760_udc_write(struct isp1760_udc *udc, u16 field, u32 val)
> > {
> > - isp1760_write32(udc->regs, reg, val);
> > + isp1760_field_write(udc->fields, field, val);
> > }
> >
> > +static u32 isp1760_udc_read_raw(struct isp1760_udc *udc, u16 reg)
> > +{
> > + u32 val;
> > +
> > + regmap_raw_read(udc->regs, reg, &val, 4);
> > +
> > + return le32_to_cpu(val);
> > +}
> > +
> > +static u16 isp1760_udc_read_raw16(struct isp1760_udc *udc, u16 reg)
> > +{
> > + u16 val;
> > +
> > + regmap_raw_read(udc->regs, reg, &val, 2);
> > +
> > + return le16_to_cpu(val);
> > +}
> > +
> > +static void isp1760_udc_write_raw(struct isp1760_udc *udc, u16 reg, u32 val)
> > +{
> > + val = cpu_to_le32(val);
> > +
> > + regmap_raw_write(udc->regs, reg, &val, 4);
> > +}
> > +
> > +static void isp1760_udc_write_raw16(struct isp1760_udc *udc, u16 reg, u16 val)
> > +{
> > + val = cpu_to_le16(val);
> > +
> > + regmap_raw_write(udc->regs, reg, &val, 2);
> > +}
> > +
> > +static void isp1760_udc_set(struct isp1760_udc *udc, u32 field)
> > +{
> > + isp1760_udc_write(udc, field, 0xFFFFFFFF);
> > +}
> > +
> > +static void isp1760_udc_clear(struct isp1760_udc *udc, u32 field)
> > +{
> > + isp1760_udc_write(udc, field, 0);
> > +}
> > +
> > +static bool isp1760_udc_is_set(struct isp1760_udc *udc, u32 field)
> > +{
> > + return !!isp1760_udc_read(udc, field);
> > +}
> > /* -----------------------------------------------------------------------------
> > * Endpoint Management
> > */
> > @@ -75,11 +121,15 @@ static struct isp1760_ep *isp1760_udc_find_ep(struct isp1760_udc *udc,
> > return NULL;
> > }
> >
> > -static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> > +static void __isp1760_udc_select_ep(struct isp1760_udc *udc,
> > + struct isp1760_ep *ep, int dir)
> > {
> > - isp1760_udc_write(ep->udc, DC_EPINDEX,
> > - DC_ENDPIDX(ep->addr & USB_ENDPOINT_NUMBER_MASK) |
> > - (dir == USB_DIR_IN ? DC_EPDIR : 0));
> > + isp1760_udc_write(udc, DC_ENDPIDX, ep->addr & USB_ENDPOINT_NUMBER_MASK);
> > +
> > + if (dir == USB_DIR_IN)
> > + isp1760_udc_set(udc, DC_EPDIR);
> > + else
> > + isp1760_udc_clear(udc, DC_EPDIR);
> > }
> >
> > /**
> > @@ -93,9 +143,10 @@ static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> > *
> > * Called with the UDC spinlock held.
> > */
> > -static void isp1760_udc_select_ep(struct isp1760_ep *ep)
> > +static void isp1760_udc_select_ep(struct isp1760_udc *udc,
> > + struct isp1760_ep *ep)
> > {
> > - __isp1760_udc_select_ep(ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> > + __isp1760_udc_select_ep(udc, ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> > }
> >
> > /* Called with the UDC spinlock held. */
> > @@ -108,9 +159,13 @@ static void isp1760_udc_ctrl_send_status(struct isp1760_ep *ep, int dir)
> > * the direction opposite to the data stage data packets, we thus need
> > * to select the OUT/IN endpoint for IN/OUT transfers.
> > */
> > - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) |
> > - (dir == USB_DIR_IN ? 0 : DC_EPDIR));
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STATUS);
> > + if (dir == USB_DIR_IN)
> > + isp1760_udc_clear(udc, DC_EPDIR);
> > + else
> > + isp1760_udc_set(udc, DC_EPDIR);
> > +
> > + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> > + isp1760_udc_set(udc, DC_STATUS);
> >
> > /*
> > * The hardware will terminate the request automatically and go back to
> > @@ -157,10 +212,10 @@ static void isp1760_udc_ctrl_send_stall(struct isp1760_ep *ep)
> > spin_lock_irqsave(&udc->lock, flags);
> >
> > /* Stall both the IN and OUT endpoints. */
> > - __isp1760_udc_select_ep(ep, USB_DIR_OUT);
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> > + __isp1760_udc_select_ep(udc, ep, USB_DIR_OUT);
> > + isp1760_udc_set(udc, DC_STALL);
> > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > + isp1760_udc_set(udc, DC_STALL);
> >
> > /* A protocol stall completes the control transaction. */
> > udc->ep0_state = ISP1760_CTRL_SETUP;
> > @@ -181,8 +236,8 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > u32 *buf;
> > int i;
> >
> > - isp1760_udc_select_ep(ep);
> > - len = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> > + isp1760_udc_select_ep(udc, ep);
> > + len = isp1760_udc_read(udc, DC_BUFLEN);
> >
> > dev_dbg(udc->isp->dev, "%s: received %u bytes (%u/%u done)\n",
> > __func__, len, req->req.actual, req->req.length);
> > @@ -198,7 +253,7 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > * datasheet doesn't clearly document how this should be
> > * handled.
> > */
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > + isp1760_udc_set(udc, DC_CLBUF);
> > return false;
> > }
> >
> > @@ -209,9 +264,9 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > * the next packet might be removed from the FIFO.
> > */
> > for (i = len; i > 2; i -= 4, ++buf)
> > - *buf = le32_to_cpu(isp1760_udc_read(udc, DC_DATAPORT));
> > + *buf = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > if (i > 0)
> > - *(u16 *)buf = le16_to_cpu(readw(udc->regs + DC_DATAPORT));
> > + *(u16 *)buf = isp1760_udc_read_raw16(udc, ISP176x_DC_DATAPORT);
> >
> > req->req.actual += len;
> >
> > @@ -253,7 +308,7 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> > __func__, req->packet_size, req->req.actual,
> > req->req.length);
> >
> > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> >
> > if (req->packet_size)
> > isp1760_udc_write(udc, DC_BUFLEN, req->packet_size);
> > @@ -265,14 +320,14 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> > * the FIFO for this kind of conditions, but doesn't seem to work.
> > */
> > for (i = req->packet_size; i > 2; i -= 4, ++buf)
> > - isp1760_udc_write(udc, DC_DATAPORT, cpu_to_le32(*buf));
> > + isp1760_udc_write_raw(udc, ISP176x_DC_DATAPORT, *buf);
> > if (i > 0)
> > - writew(cpu_to_le16(*(u16 *)buf), udc->regs + DC_DATAPORT);
> > + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, *(u16 *)buf);
> >
> > if (ep->addr == 0)
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > + isp1760_udc_set(udc, DC_DSEN);
> > if (!req->packet_size)
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_VENDP);
> > + isp1760_udc_set(udc, DC_VENDP);
> > }
> >
> > static void isp1760_ep_rx_ready(struct isp1760_ep *ep)
> > @@ -408,19 +463,24 @@ static int __isp1760_udc_set_halt(struct isp1760_ep *ep, bool halt)
> > return -EINVAL;
> > }
> >
> > - isp1760_udc_select_ep(ep);
> > - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> > + isp1760_udc_select_ep(udc, ep);
> > +
> > + if (halt)
> > + isp1760_udc_set(udc, DC_STALL);
> > + else
> > + isp1760_udc_clear(udc, DC_STALL);
> >
> > if (ep->addr == 0) {
> > /* When halting the control endpoint, stall both IN and OUT. */
> > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > + if (halt)
> > + isp1760_udc_set(udc, DC_STALL);
> > + else
> > + isp1760_udc_clear(udc, DC_STALL);
> > } else if (!halt) {
> > /* Reset the data PID by cycling the endpoint enable bit. */
> > - u16 eptype = isp1760_udc_read(udc, DC_EPTYPE);
> > -
> > - isp1760_udc_write(udc, DC_EPTYPE, eptype & ~DC_EPENABLE);
> > - isp1760_udc_write(udc, DC_EPTYPE, eptype);
> > + isp1760_udc_clear(udc, DC_EPENABLE);
> > + isp1760_udc_set(udc, DC_EPENABLE);
> >
> > /*
> > * Disabling the endpoint emptied the transmit FIFO, fill it
> > @@ -479,12 +539,14 @@ static int isp1760_udc_get_status(struct isp1760_udc *udc,
> > return -EINVAL;
> > }
> >
> > - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) | DC_EPDIR);
> > + isp1760_udc_set(udc, DC_EPDIR);
> > + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> > +
> > isp1760_udc_write(udc, DC_BUFLEN, 2);
> >
> > - writew(cpu_to_le16(status), udc->regs + DC_DATAPORT);
> > + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, status);
> >
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > + isp1760_udc_set(udc, DC_DSEN);
> >
> > dev_dbg(udc->isp->dev, "%s: status 0x%04x\n", __func__, status);
> >
> > @@ -508,7 +570,8 @@ static int isp1760_udc_set_address(struct isp1760_udc *udc, u16 addr)
> > usb_gadget_set_state(&udc->gadget, addr ? USB_STATE_ADDRESS :
> > USB_STATE_DEFAULT);
> >
> > - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN | addr);
> > + isp1760_udc_write(udc, DC_DEVADDR, addr);
> > + isp1760_udc_set(udc, DC_DEVEN);
> >
> > spin_lock(&udc->lock);
> > isp1760_udc_ctrl_send_status(&udc->ep[0], USB_DIR_OUT);
> > @@ -650,9 +713,9 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
> >
> > spin_lock(&udc->lock);
> >
> > - isp1760_udc_write(udc, DC_EPINDEX, DC_EP0SETUP);
> > + isp1760_udc_set(udc, DC_EP0SETUP);
> >
> > - count = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> > + count = isp1760_udc_read(udc, DC_BUFLEN);
> > if (count != sizeof(req)) {
> > spin_unlock(&udc->lock);
> >
> > @@ -663,8 +726,8 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
> > return;
> > }
> >
> > - req.data[0] = isp1760_udc_read(udc, DC_DATAPORT);
> > - req.data[1] = isp1760_udc_read(udc, DC_DATAPORT);
> > + req.data[0] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > + req.data[1] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> >
> > if (udc->ep0_state != ISP1760_CTRL_SETUP) {
> > spin_unlock(&udc->lock);
> > @@ -732,13 +795,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
> >
> > switch (usb_endpoint_type(desc)) {
> > case USB_ENDPOINT_XFER_ISOC:
> > - type = DC_ENDPTYP_ISOC;
> > + type = ISP176x_DC_ENDPTYP_ISOC;
> > break;
> > case USB_ENDPOINT_XFER_BULK:
> > - type = DC_ENDPTYP_BULK;
> > + type = ISP176x_DC_ENDPTYP_BULK;
> > break;
> > case USB_ENDPOINT_XFER_INT:
> > - type = DC_ENDPTYP_INTERRUPT;
> > + type = ISP176x_DC_ENDPTYP_INTERRUPT;
> > break;
> > case USB_ENDPOINT_XFER_CONTROL:
> > default:
> > @@ -755,10 +818,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
> > uep->halted = false;
> > uep->wedged = false;
> >
> > - isp1760_udc_select_ep(uep);
> > - isp1760_udc_write(udc, DC_EPMAXPKTSZ, uep->maxpacket);
> > + isp1760_udc_select_ep(udc, uep);
> > +
> > + isp1760_udc_write(udc, DC_FFOSZ, uep->maxpacket);
> > isp1760_udc_write(udc, DC_BUFLEN, uep->maxpacket);
> > - isp1760_udc_write(udc, DC_EPTYPE, DC_EPENABLE | type);
> > +
> > + isp1760_udc_write(udc, DC_ENDPTYP, type);
> > + isp1760_udc_set(udc, DC_EPENABLE);
> >
> > spin_unlock_irqrestore(&udc->lock, flags);
> >
> > @@ -786,8 +852,9 @@ static int isp1760_ep_disable(struct usb_ep *ep)
> > uep->desc = NULL;
> > uep->maxpacket = 0;
> >
> > - isp1760_udc_select_ep(uep);
> > - isp1760_udc_write(udc, DC_EPTYPE, 0);
> > + isp1760_udc_select_ep(udc, uep);
> > + isp1760_udc_clear(udc, DC_EPENABLE);
> > + isp1760_udc_clear(udc, DC_ENDPTYP);
> >
> > /* TODO Synchronize with the IRQ handler */
> >
> > @@ -864,8 +931,8 @@ static int isp1760_ep_queue(struct usb_ep *ep, struct usb_request *_req,
> >
> > case ISP1760_CTRL_DATA_OUT:
> > list_add_tail(&req->queue, &uep->queue);
> > - __isp1760_udc_select_ep(uep, USB_DIR_OUT);
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > + __isp1760_udc_select_ep(udc, uep, USB_DIR_OUT);
> > + isp1760_udc_set(udc, DC_DSEN);
> > break;
> >
> > case ISP1760_CTRL_STATUS:
> > @@ -1025,14 +1092,14 @@ static void isp1760_ep_fifo_flush(struct usb_ep *ep)
> >
> > spin_lock_irqsave(&udc->lock, flags);
> >
> > - isp1760_udc_select_ep(uep);
> > + isp1760_udc_select_ep(udc, uep);
> >
> > /*
> > * Set the CLBUF bit twice to flush both buffers in case double
> > * buffering is enabled.
> > */
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > + isp1760_udc_set(udc, DC_CLBUF);
> > + isp1760_udc_set(udc, DC_CLBUF);
> >
> > spin_unlock_irqrestore(&udc->lock, flags);
> > }
> > @@ -1091,19 +1158,30 @@ static void isp1760_udc_init_hw(struct isp1760_udc *udc)
> > * ACK tokens only (and NYET for the out pipe). The default
> > * configuration also generates an interrupt on the first NACK token.
> > */
> > - isp1760_udc_write(udc, DC_INTCONF, DC_CDBGMOD_ACK | DC_DDBGMODIN_ACK |
> > - DC_DDBGMODOUT_ACK_NYET);
> > -
> > - isp1760_udc_write(udc, DC_INTENABLE, DC_IEPRXTX(7) | DC_IEPRXTX(6) |
> > - DC_IEPRXTX(5) | DC_IEPRXTX(4) | DC_IEPRXTX(3) |
> > - DC_IEPRXTX(2) | DC_IEPRXTX(1) | DC_IEPRXTX(0) |
> > - DC_IEP0SETUP | DC_IEVBUS | DC_IERESM | DC_IESUSP |
> > - DC_IEHS_STA | DC_IEBRST);
> > + isp1760_udc_set(udc, DC_CDBGMOD_ACK);
> > + isp1760_udc_set(udc, DC_DDBGMODIN_ACK);
> > + isp1760_udc_set(udc, DC_DDBGMODOUT_ACK);
> > +
> > + isp1760_udc_set(udc, DC_IEPRXTX_7);
> > + isp1760_udc_set(udc, DC_IEPRXTX_6);
> > + isp1760_udc_set(udc, DC_IEPRXTX_5);
> > + isp1760_udc_set(udc, DC_IEPRXTX_4);
> > + isp1760_udc_set(udc, DC_IEPRXTX_3);
> > + isp1760_udc_set(udc, DC_IEPRXTX_2);
> > + isp1760_udc_set(udc, DC_IEPRXTX_1);
> > + isp1760_udc_set(udc, DC_IEPRXTX_0);
> > +
> > + isp1760_udc_set(udc, DC_IEP0SETUP);
> > + isp1760_udc_set(udc, DC_IEVBUS);
> > + isp1760_udc_set(udc, DC_IERESM);
> > + isp1760_udc_set(udc, DC_IESUSP);
> > + isp1760_udc_set(udc, DC_IEHS_STA);
> > + isp1760_udc_set(udc, DC_IEBRST);
> >
> > if (udc->connected)
> > isp1760_set_pullup(udc->isp, true);
> >
> > - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN);
> > + isp1760_udc_set(udc, DC_DEVEN);
> > }
> >
> > static void isp1760_udc_reset(struct isp1760_udc *udc)
> > @@ -1152,7 +1230,7 @@ static int isp1760_udc_get_frame(struct usb_gadget *gadget)
> > {
> > struct isp1760_udc *udc = gadget_to_udc(gadget);
> >
> > - return isp1760_udc_read(udc, DC_FRAMENUM) & ((1 << 11) - 1);
> > + return isp1760_udc_read(udc, DC_FRAMENUM);
> > }
> >
> > static int isp1760_udc_wakeup(struct usb_gadget *gadget)
> > @@ -1219,7 +1297,7 @@ static int isp1760_udc_start(struct usb_gadget *gadget,
> > usb_gadget_set_state(&udc->gadget, USB_STATE_ATTACHED);
> >
> > /* DMA isn't supported yet, don't enable the DMA clock. */
> > - isp1760_udc_write(udc, DC_MODE, DC_GLINTENA);
> > + isp1760_udc_set(udc, DC_GLINTENA);
> >
> > isp1760_udc_init_hw(udc);
> >
> > @@ -1238,7 +1316,7 @@ static int isp1760_udc_stop(struct usb_gadget *gadget)
> >
> > del_timer_sync(&udc->vbus_timer);
> >
> > - isp1760_udc_write(udc, DC_MODE, 0);
> > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> >
> > spin_lock_irqsave(&udc->lock, flags);
> > udc->driver = NULL;
> > @@ -1266,9 +1344,9 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> > unsigned int i;
> > u32 status;
> >
> > - status = isp1760_udc_read(udc, DC_INTERRUPT)
> > - & isp1760_udc_read(udc, DC_INTENABLE);
> > - isp1760_udc_write(udc, DC_INTERRUPT, status);
> > + status = isp1760_reg_read(udc->regs, ISP176x_DC_INTERRUPT)
> > + & isp1760_reg_read(udc->regs, ISP176x_DC_INTENABLE);
> > + isp1760_reg_write(udc->regs, ISP176x_DC_INTERRUPT, status);
> >
> > if (status & DC_IEVBUS) {
> > dev_dbg(udc->isp->dev, "%s(VBUS)\n", __func__);
> > @@ -1313,7 +1391,7 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> > dev_dbg(udc->isp->dev, "%s(SUSP)\n", __func__);
> >
> > spin_lock(&udc->lock);
> > - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> > + if (!isp1760_udc_is_set(udc, DC_VBUSSTAT))
> > isp1760_udc_disconnect(udc);
> > else
> > isp1760_udc_suspend(udc);
> > @@ -1335,7 +1413,7 @@ static void isp1760_udc_vbus_poll(struct timer_list *t)
> >
> > spin_lock_irqsave(&udc->lock, flags);
> >
> > - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> > + if (!(isp1760_udc_is_set(udc, DC_VBUSSTAT)))
> > isp1760_udc_disconnect(udc);
> > else if (udc->gadget.state >= USB_STATE_POWERED)
> > mod_timer(&udc->vbus_timer,
> > @@ -1412,9 +1490,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> > * register, and reading the scratch register value back. The chip ID
> > * and scratch register contents must match the expected values.
> > */
> > - isp1760_udc_write(udc, DC_SCRATCH, 0xbabe);
> > - chipid = isp1760_udc_read(udc, DC_CHIPID);
> > - scratch = isp1760_udc_read(udc, DC_SCRATCH);
> > + isp1760_reg_write(udc->regs, ISP176x_DC_SCRATCH, 0xbabe);
> > + chipid = isp1760_reg_read(udc->regs, ISP176x_DC_CHIPID);
> > + scratch = isp1760_reg_read(udc->regs, ISP176x_DC_SCRATCH);
> >
> > if (scratch != 0xbabe) {
> > dev_err(udc->isp->dev,
> > @@ -1429,9 +1507,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> > }
> >
> > /* Reset the device controller. */
> > - isp1760_udc_write(udc, DC_MODE, DC_SFRESET);
> > + isp1760_udc_set(udc, DC_SFRESET);
> > usleep_range(10000, 11000);
> > - isp1760_udc_write(udc, DC_MODE, 0);
> > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > usleep_range(10000, 11000);
> >
> > return 0;
> > @@ -1445,7 +1523,6 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq,
> >
> > udc->irq = -1;
> > udc->isp = isp;
> > - udc->regs = isp->regs;
> >
> > spin_lock_init(&udc->lock);
> > timer_setup(&udc->vbus_timer, isp1760_udc_vbus_poll, 0);
> > diff --git a/drivers/usb/isp1760/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
> > index d2df650d54e9..a49096c0ac8e 100644
> > --- a/drivers/usb/isp1760/isp1760-udc.h
> > +++ b/drivers/usb/isp1760/isp1760-udc.h
> > @@ -17,6 +17,8 @@
> > #include <linux/timer.h>
> > #include <linux/usb/gadget.h>
> >
> > +#include "isp1760-regs.h"
>
> Is this needed ?
for DC_FIELD_MAX below, right?
Cheers,
Rui
>
> > +
> > struct isp1760_device;
> > struct isp1760_udc;
> >
> > @@ -48,7 +50,7 @@ struct isp1760_ep {
> > * struct isp1760_udc - UDC state information
> > * irq: IRQ number
> > * irqname: IRQ name (as passed to request_irq)
> > - * regs: Base address of the UDC registers
> > + * regs: regmap for UDC registers
> > * driver: Gadget driver
> > * gadget: Gadget device
> > * lock: Protects driver, vbus_timer, ep, ep0_*, DC_EPINDEX register
> > @@ -59,12 +61,13 @@ struct isp1760_ep {
> > * connected: Tracks gadget driver bus connection state
> > */
> > struct isp1760_udc {
> > -#ifdef CONFIG_USB_ISP1761_UDC
> > struct isp1760_device *isp;
> >
> > int irq;
> > char *irqname;
> > - void __iomem *regs;
> > +
> > + struct regmap *regs;
> > + struct regmap_field *fields[DC_FIELD_MAX];
> >
> > struct usb_gadget_driver *driver;
> > struct usb_gadget gadget;
> > @@ -81,7 +84,6 @@ struct isp1760_udc {
> > bool connected;
> >
> > unsigned int devstatus;
> > -#endif
> > };
> >
> > #ifdef CONFIG_USB_ISP1761_UDC
>
> --
> Regards,
>
> Laurent Pinchart
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 1/7] usb: isp1760: move to regmap for register access
2021-05-06 13:39 ` Rui Miguel Silva
@ 2021-05-06 13:45 ` Laurent Pinchart
2021-05-06 14:14 ` Rui Miguel Silva
0 siblings, 1 reply; 25+ messages in thread
From: Laurent Pinchart @ 2021-05-06 13:45 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: Greg Kroah-Hartman, Sebastian Siewior, Rob Herring, linux-usb,
devicetree
Hi Rui,
On Thu, May 06, 2021 at 02:39:13PM +0100, Rui Miguel Silva wrote:
> On Thu May 6, 2021 at 1:24 PM WEST, Laurent Pinchart wrote:
> > On Tue, May 04, 2021 at 11:19:04AM +0100, Rui Miguel Silva wrote:
> > > Rework access to registers and memory to use regmap framework.
> > > No change in current feature or way of work is intended with this
> > > change.
> > >
> > > This will allow to reuse this driver with other IP of this family,
> > > for example isp1763, with little changes and effort.
> > >
> > > Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
> > > ---
> > > drivers/usb/isp1760/isp1760-core.c | 123 +++++---
> > > drivers/usb/isp1760/isp1760-core.h | 38 ++-
> > > drivers/usb/isp1760/isp1760-hcd.c | 436 ++++++++++++++--------------
> > > drivers/usb/isp1760/isp1760-hcd.h | 18 +-
> > > drivers/usb/isp1760/isp1760-if.c | 4 +-
> > > drivers/usb/isp1760/isp1760-regs.h | 442 +++++++++++++++++------------
> > > drivers/usb/isp1760/isp1760-udc.c | 235 +++++++++------
> > > drivers/usb/isp1760/isp1760-udc.h | 10 +-
> > > 8 files changed, 779 insertions(+), 527 deletions(-)
> > >
> > > diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
> > > index fdeb4cf97cc5..f78e637d3b9a 100644
> > > --- a/drivers/usb/isp1760/isp1760-core.c
> > > +++ b/drivers/usb/isp1760/isp1760-core.c
> > > @@ -25,8 +25,8 @@
> > >
> > > static void isp1760_init_core(struct isp1760_device *isp)
> > > {
> > > - u32 otgctrl;
> > > - u32 hwmode;
> > > + struct isp1760_hcd *hcd = &isp->hcd;
> > > + struct isp1760_udc *udc = &isp->udc;
> > >
> > > /* Low-level chip reset */
> > > if (isp->rst_gpio) {
> > > @@ -39,24 +39,22 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > * Reset the host controller, including the CPU interface
> > > * configuration.
> > > */
> > > - isp1760_write32(isp->regs, HC_RESET_REG, SW_RESET_RESET_ALL);
> > > + isp1760_field_set(hcd->fields, SW_RESET_RESET_ALL);
> > > msleep(100);
> > >
> > > /* Setup HW Mode Control: This assumes a level active-low interrupt */
> > > - hwmode = HW_DATA_BUS_32BIT;
> > > -
> > > if (isp->devflags & ISP1760_FLAG_BUS_WIDTH_16)
> > > - hwmode &= ~HW_DATA_BUS_32BIT;
> > > + isp1760_field_clear(hcd->fields, HW_DATA_BUS_WIDTH);
> > > if (isp->devflags & ISP1760_FLAG_ANALOG_OC)
> > > - hwmode |= HW_ANA_DIGI_OC;
> > > + isp1760_field_set(hcd->fields, HW_ANA_DIGI_OC);
> > > if (isp->devflags & ISP1760_FLAG_DACK_POL_HIGH)
> > > - hwmode |= HW_DACK_POL_HIGH;
> > > + isp1760_field_set(hcd->fields, HW_DACK_POL_HIGH);
> > > if (isp->devflags & ISP1760_FLAG_DREQ_POL_HIGH)
> > > - hwmode |= HW_DREQ_POL_HIGH;
> > > + isp1760_field_set(hcd->fields, HW_DREQ_POL_HIGH);
> > > if (isp->devflags & ISP1760_FLAG_INTR_POL_HIGH)
> > > - hwmode |= HW_INTR_HIGH_ACT;
> > > + isp1760_field_set(hcd->fields, HW_INTR_HIGH_ACT);
> > > if (isp->devflags & ISP1760_FLAG_INTR_EDGE_TRIG)
> > > - hwmode |= HW_INTR_EDGE_TRIG;
> > > + isp1760_field_set(hcd->fields, HW_INTR_EDGE_TRIG);
> >
> > This makes a difference, as you're now writing the register for every
> > bit. It can have a performance impact (although that should be small,
>
> This is in initialization time, so I am not expecting this to have a
> major performance impact.
This comment applies to the rest of the driver too, not just this
location. Sorry for not making that clear.
> > but still), but also a functional impact. I'd rather keep a single write
> > for this kind of sequence, especially when no read-modify-write sequence
> > is needed. If you need read-modify-write for the platform you work on,
> > switching to such patterns should be done in a patch of its own.
>
> For me that's ok, I do not have strong feelings about this. I can
> change it for isp1760_reg_write at the end.
Thanks.
> > >
> > > /*
> > > * The ISP1761 has a dedicated DC IRQ line but supports sharing the HC
> > > @@ -65,18 +63,10 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > * spurious interrupts during HCD registration.
> > > */
> > > if (isp->devflags & ISP1760_FLAG_ISP1761) {
> > > - isp1760_write32(isp->regs, DC_MODE, 0);
> > > - hwmode |= HW_COMN_IRQ;
> > > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > > + isp1760_field_set(hcd->fields, HW_COMN_IRQ);
> > > }
> > >
> > > - /*
> > > - * We have to set this first in case we're in 16-bit mode.
> > > - * Write it twice to ensure correct upper bits if switching
> > > - * to 16-bit mode.
> > > - */
> > > - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> > > - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> > > -
> > > /*
> > > * PORT 1 Control register of the ISP1760 is the OTG control register
> > > * on ISP1761.
> > > @@ -85,14 +75,15 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > * when OTG is requested.
> > > */
> > > if ((isp->devflags & ISP1760_FLAG_ISP1761) &&
> > > - (isp->devflags & ISP1760_FLAG_OTG_EN))
> > > - otgctrl = ((HW_DM_PULLDOWN | HW_DP_PULLDOWN) << 16)
> > > - | HW_OTG_DISABLE;
> > > - else
> > > - otgctrl = (HW_SW_SEL_HC_DC << 16)
> > > - | (HW_VBUS_DRV | HW_SEL_CP_EXT);
> > > -
> > > - isp1760_write32(isp->regs, HC_PORT1_CTRL, otgctrl);
> > > + (isp->devflags & ISP1760_FLAG_OTG_EN)) {
> > > + isp1760_field_set(hcd->fields, HW_DM_PULLDOWN);
> > > + isp1760_field_set(hcd->fields, HW_DP_PULLDOWN);
> > > + isp1760_field_set(hcd->fields, HW_OTG_DISABLE);
> > > + } else {
> > > + isp1760_field_set(hcd->fields, HW_SW_SEL_HC_DC);
> > > + isp1760_field_set(hcd->fields, HW_VBUS_DRV);
> > > + isp1760_field_set(hcd->fields, HW_SEL_CP_EXT);
> > > + }
> > >
> > > dev_info(isp->dev, "bus width: %u, oc: %s\n",
> > > isp->devflags & ISP1760_FLAG_BUS_WIDTH_16 ? 16 : 32,
> > > @@ -101,16 +92,43 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > >
> > > void isp1760_set_pullup(struct isp1760_device *isp, bool enable)
> > > {
> > > - isp1760_write32(isp->regs, HW_OTG_CTRL_SET,
> > > - enable ? HW_DP_PULLUP : HW_DP_PULLUP << 16);
> > > + struct isp1760_udc *udc = &isp->udc;
> > > +
> > > + if (enable)
> > > + isp1760_field_set(udc->fields, HW_DP_PULLUP);
> > > + else
> > > + isp1760_field_set(udc->fields, HW_DP_PULLUP_CLEAR);
> > > }
> > >
> > > +static struct regmap_config isp1760_hc_regmap_conf = {
> > > + .name = "isp1760-hc",
> > > + .reg_bits = 16,
> > > + .val_bits = 32,
> > > + .fast_io = true,
> > > + .max_register = ISP176x_HC_MEMORY,
> > > + .volatile_table = &isp176x_hc_volatile_table,
> > > +};
> > > +
> > > +static struct regmap_config isp1761_dc_regmap_conf = {
> > > + .name = "isp1761-dc",
> > > + .reg_bits = 16,
> > > + .val_bits = 32,
> > > + .fast_io = true,
> > > + .max_register = ISP1761_DC_OTG_CTRL_CLEAR,
> > > + .volatile_table = &isp176x_dc_volatile_table,
> > > +};
> > > +
> > > int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > > struct device *dev, unsigned int devflags)
> > > {
> > > struct isp1760_device *isp;
> > > + struct isp1760_hcd *hcd;
> > > + struct isp1760_udc *udc;
> > > bool udc_disabled = !(devflags & ISP1760_FLAG_ISP1761);
> > > + struct regmap_field *f;
> > > + void __iomem *base;
> > > int ret;
> > > + int i;
> > >
> > > /*
> > > * If neither the HCD not the UDC is enabled return an error, as no
> > > @@ -126,19 +144,52 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > >
> > > isp->dev = dev;
> > > isp->devflags = devflags;
> > > + hcd = &isp->hcd;
> > > + udc = &isp->udc;
> > > +
> > > + if (devflags & ISP1760_FLAG_BUS_WIDTH_16) {
> > > + isp1760_hc_regmap_conf.val_bits = 16;
> > > + isp1761_dc_regmap_conf.val_bits = 16;
> > > + }
> > >
> > > isp->rst_gpio = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);
> > > if (IS_ERR(isp->rst_gpio))
> > > return PTR_ERR(isp->rst_gpio);
> > >
> > > - isp->regs = devm_ioremap_resource(dev, mem);
> > > - if (IS_ERR(isp->regs))
> > > - return PTR_ERR(isp->regs);
> > > + hcd->base = devm_ioremap_resource(dev, mem);
> > > + if (IS_ERR(hcd->base))
> > > + return PTR_ERR(hcd->base);
> > > +
> > > + hcd->regs = devm_regmap_init_mmio(dev, base, &isp1760_hc_regmap_conf);
> > > + if (IS_ERR(hcd->regs))
> > > + return PTR_ERR(hcd->regs);
> > > +
> > > + for (i = 0; i < HC_FIELD_MAX; i++) {
> > > + f = devm_regmap_field_alloc(dev, hcd->regs,
> > > + isp1760_hc_reg_fields[i]);
> > > + if (IS_ERR(f))
> > > + return PTR_ERR(f);
> > > +
> > > + hcd->fields[i] = f;
> > > + }
> > > +
> > > + udc->regs = devm_regmap_init_mmio(dev, base, &isp1761_dc_regmap_conf);
> > > + if (IS_ERR(udc->regs))
> > > + return PTR_ERR(udc->regs);
> > > +
> > > + for (i = 0; i < DC_FIELD_MAX; i++) {
> > > + f = devm_regmap_field_alloc(dev, udc->regs,
> > > + isp1761_dc_reg_fields[i]);
> > > + if (IS_ERR(f))
> > > + return PTR_ERR(f);
> > > +
> > > + udc->fields[i] = f;
> > > + }
> > >
> > > isp1760_init_core(isp);
> > >
> > > if (IS_ENABLED(CONFIG_USB_ISP1760_HCD) && !usb_disabled()) {
> > > - ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq,
> > > + ret = isp1760_hcd_register(hcd, mem, irq,
> > > irqflags | IRQF_SHARED, dev);
> > > if (ret < 0)
> > > return ret;
> > > @@ -147,7 +198,7 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > > if (IS_ENABLED(CONFIG_USB_ISP1761_UDC) && !udc_disabled) {
> > > ret = isp1760_udc_register(isp, irq, irqflags);
> > > if (ret < 0) {
> > > - isp1760_hcd_unregister(&isp->hcd);
> > > + isp1760_hcd_unregister(hcd);
> > > return ret;
> > > }
> > > }
> > > diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
> > > index d9a0a4cc467c..8fec6395f19f 100644
> > > --- a/drivers/usb/isp1760/isp1760-core.h
> > > +++ b/drivers/usb/isp1760/isp1760-core.h
> > > @@ -14,6 +14,7 @@
> > > #define _ISP1760_CORE_H_
> > >
> > > #include <linux/ioport.h>
> > > +#include <linux/regmap.h>
> > >
> > > #include "isp1760-hcd.h"
> > > #include "isp1760-udc.h"
> > > @@ -38,7 +39,6 @@ struct gpio_desc;
> > > struct isp1760_device {
> > > struct device *dev;
> > >
> > > - void __iomem *regs;
> > > unsigned int devflags;
> > > struct gpio_desc *rst_gpio;
> > >
> > > @@ -52,14 +52,42 @@ void isp1760_unregister(struct device *dev);
> > >
> > > void isp1760_set_pullup(struct isp1760_device *isp, bool enable);
> > >
> > > -static inline u32 isp1760_read32(void __iomem *base, u32 reg)
> > > +static inline u32 isp1760_field_read(struct regmap_field **fields, u32 field)
> > > {
> > > - return readl(base + reg);
> > > + unsigned int val;
> > > +
> > > + regmap_field_read(fields[field], &val);
> > > +
> > > + return val;
> > > +}
> > > +
> > > +static inline void isp1760_field_write(struct regmap_field **fields, u32 field,
> > > + u32 val)
> > > +{
> > > + regmap_field_write(fields[field], val);
> > > +}
> > > +
> > > +static inline void isp1760_field_set(struct regmap_field **fields, u32 field)
> > > +{
> > > + isp1760_field_write(fields, field, 0xFFFFFFFF);
> > > }
> > >
> > > -static inline void isp1760_write32(void __iomem *base, u32 reg, u32 val)
> > > +static inline void isp1760_field_clear(struct regmap_field **fields, u32 field)
> > > {
> > > - writel(val, base + reg);
> > > + isp1760_field_write(fields, field, 0);
> > > }
> > >
> > > +static inline u32 isp1760_reg_read(struct regmap *regs, u32 reg)
> > > +{
> > > + unsigned int val;
> > > +
> > > + regmap_read(regs, reg, &val);
> > > +
> > > + return val;
> > > +}
> > > +
> > > +static inline void isp1760_reg_write(struct regmap *regs, u32 reg, u32 val)
> > > +{
> > > + regmap_write(regs, reg, val);
> > > +}
> > > #endif
> > > diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
> > > index 33ae656c4b68..0601b1a4bd42 100644
> > > --- a/drivers/usb/isp1760/isp1760-hcd.c
> > > +++ b/drivers/usb/isp1760/isp1760-hcd.c
> > > @@ -66,6 +66,10 @@ struct ptd {
> > > #define ATL_PTD_OFFSET 0x0c00
> > > #define PAYLOAD_OFFSET 0x1000
> > >
> > > +#define ISP_BANK_0 0x00
> > > +#define ISP_BANK_1 0x01
> > > +#define ISP_BANK_2 0x02
> > > +#define ISP_BANK_3 0x03
> > >
> > > /* ATL */
> > > /* DW0 */
> > > @@ -159,16 +163,59 @@ struct urb_listitem {
> > > };
> > >
> > > /*
> > > - * Access functions for isp176x registers (addresses 0..0x03FF).
> > > + * Access functions for isp176x registers regmap fields
> > > */
> > > -static u32 reg_read32(void __iomem *base, u32 reg)
> > > +static u32 isp1760_hcd_read(struct usb_hcd *hcd, u32 field)
> > > {
> > > - return isp1760_read32(base, reg);
> > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > +
> > > + return isp1760_field_read(priv->fields, field);
> > > +}
> > > +
> > > +static void isp1760_hcd_write(struct usb_hcd *hcd, u32 field, u32 val)
> > > +{
> > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > +
> > > + isp1760_field_write(priv->fields, field, val);
> > > +}
> > > +
> > > +static void isp1760_hcd_set(struct usb_hcd *hcd, u32 field)
> > > +{
> > > + isp1760_hcd_write(hcd, field, 0xFFFFFFFF);
> > > +}
> > > +
> > > +static void isp1760_hcd_clear(struct usb_hcd *hcd, u32 field)
> > > +{
> > > + isp1760_hcd_write(hcd, field, 0);
> > > +}
> > > +
> > > +static int isp1760_hcd_set_poll_timeout(struct usb_hcd *hcd, u32 field,
> > > + u32 timeout_us)
> > > +{
> > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > + unsigned int val;
> > > +
> > > + isp1760_hcd_set(hcd, field);
> > > +
> > > + return regmap_field_read_poll_timeout(priv->fields[field], val, 1, 1,
> > > + timeout_us);
> > > }
> > >
> > > -static void reg_write32(void __iomem *base, u32 reg, u32 val)
> > > +static int isp1760_hcd_clear_poll_timeout(struct usb_hcd *hcd, u32 field,
> > > + u32 timeout_us)
> > > {
> > > - isp1760_write32(base, reg, val);
> > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > + unsigned int val;
> > > +
> > > + isp1760_hcd_clear(hcd, field);
> > > +
> > > + return regmap_field_read_poll_timeout(priv->fields[field], val, 0, 1,
> > > + timeout_us);
> > > +}
> > > +
> > > +static bool isp1760_hcd_is_set(struct usb_hcd *hcd, u32 field)
> > > +{
> > > + return !!isp1760_hcd_read(hcd, field);
> > > }
> > >
> > > /*
> > > @@ -231,12 +278,15 @@ static void bank_reads8(void __iomem *src_base, u32 src_offset, u32 bank_addr,
> > > }
> > > }
> > >
> > > -static void mem_reads8(void __iomem *src_base, u32 src_offset, void *dst,
> > > - u32 bytes)
> > > +static void mem_reads8(struct usb_hcd *hcd, void __iomem *src_base,
> > > + u32 src_offset, void *dst, u32 bytes)
> > > {
> > > - reg_write32(src_base, HC_MEMORY_REG, src_offset + ISP_BANK(0));
> > > + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> > > + isp1760_hcd_write(hcd, MEM_START_ADDR, src_offset);
> > > +
> > > ndelay(90);
> > > - bank_reads8(src_base, src_offset, ISP_BANK(0), dst, bytes);
> > > +
> > > + bank_reads8(src_base, src_offset, ISP_BANK_0, dst, bytes);
> > > }
> > >
> > > static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> > > @@ -278,14 +328,15 @@ static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> > > * Read and write ptds. 'ptd_offset' should be one of ISO_PTD_OFFSET,
> > > * INT_PTD_OFFSET, and ATL_PTD_OFFSET. 'slot' should be less than 32.
> > > */
> > > -static void ptd_read(void __iomem *base, u32 ptd_offset, u32 slot,
> > > - struct ptd *ptd)
> > > +static void ptd_read(struct usb_hcd *hcd, void __iomem *base,
> > > + u32 ptd_offset, u32 slot, struct ptd *ptd)
> > > {
> > > - reg_write32(base, HC_MEMORY_REG,
> > > - ISP_BANK(0) + ptd_offset + slot*sizeof(*ptd));
> > > + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> > > + isp1760_hcd_write(hcd, MEM_START_ADDR,
> > > + ptd_offset + slot * sizeof(*ptd));
> > > ndelay(90);
> > > - bank_reads8(base, ptd_offset + slot*sizeof(*ptd), ISP_BANK(0),
> > > - (void *) ptd, sizeof(*ptd));
> > > + bank_reads8(base, ptd_offset + slot * sizeof(*ptd), ISP_BANK_0,
> > > + (void *)ptd, sizeof(*ptd));
> > > }
> > >
> > > static void ptd_write(void __iomem *base, u32 ptd_offset, u32 slot,
> > > @@ -377,34 +428,15 @@ static void free_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
> > > qtd->payload_addr = 0;
> > > }
> > >
> > > -static int handshake(struct usb_hcd *hcd, u32 reg,
> > > - u32 mask, u32 done, int usec)
> > > -{
> > > - u32 result;
> > > - int ret;
> > > -
> > > - ret = readl_poll_timeout_atomic(hcd->regs + reg, result,
> > > - ((result & mask) == done ||
> > > - result == U32_MAX), 1, usec);
> > > - if (result == U32_MAX)
> > > - return -ENODEV;
> > > -
> > > - return ret;
> > > -}
> > > -
> > > /* reset a non-running (STS_HALT == 1) controller */
> > > static int ehci_reset(struct usb_hcd *hcd)
> > > {
> > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > >
> > > - u32 command = reg_read32(hcd->regs, HC_USBCMD);
> > > -
> > > - command |= CMD_RESET;
> > > - reg_write32(hcd->regs, HC_USBCMD, command);
> > > hcd->state = HC_STATE_HALT;
> > > priv->next_statechange = jiffies;
> > >
> > > - return handshake(hcd, HC_USBCMD, CMD_RESET, 0, 250 * 1000);
> > > + return isp1760_hcd_set_poll_timeout(hcd, CMD_RESET, 250 * 1000);
> > > }
> > >
> > > static struct isp1760_qh *qh_alloc(gfp_t flags)
> > > @@ -432,8 +464,10 @@ static void qh_free(struct isp1760_qh *qh)
> > > /* one-time init, only for memory state */
> > > static int priv_init(struct usb_hcd *hcd)
> > > {
> > > - struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > - u32 hcc_params;
> > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > + u32 isoc_cache;
> > > + u32 isoc_thres;
> > > +
> > > int i;
> > >
> > > spin_lock_init(&priv->lock);
> > > @@ -448,12 +482,14 @@ static int priv_init(struct usb_hcd *hcd)
> > > priv->periodic_size = DEFAULT_I_TDPS;
> > >
> > > /* controllers may cache some of the periodic schedule ... */
> > > - hcc_params = reg_read32(hcd->regs, HC_HCCPARAMS);
> > > + isoc_cache = isp1760_hcd_read(hcd->regs, HCC_ISOC_CACHE);
> > > + isoc_thres = isp1760_hcd_read(hcd->regs, HCC_ISOC_THRES);
> > > +
> > > /* full frame cache */
> > > - if (HCC_ISOC_CACHE(hcc_params))
> > > + if (isoc_cache)
> > > priv->i_thresh = 8;
> > > else /* N microframes cached */
> > > - priv->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
> > > + priv->i_thresh = 2 + isoc_thres;
> > >
> > > return 0;
> > > }
> > > @@ -462,12 +498,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > > {
> > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > int result;
> > > - u32 scratch, hwmode;
> > > + u32 scratch;
> > > +
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_SCRATCH, 0xdeadbabe);
> > >
> > > - reg_write32(hcd->regs, HC_SCRATCH_REG, 0xdeadbabe);
> > > /* Change bus pattern */
> > > - scratch = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> > > - scratch = reg_read32(hcd->regs, HC_SCRATCH_REG);
> > > + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> > > + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_SCRATCH);
> > > if (scratch != 0xdeadbabe) {
> > > dev_err(hcd->self.controller, "Scratch test failed.\n");
> > > return -ENODEV;
> > > @@ -481,10 +518,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > > * the host controller through the EHCI USB Command register. The device
> > > * has been reset in core code anyway, so this shouldn't matter.
> > > */
> > > - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG, 0);
> > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > > - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_BUFFER_STATUS, 0);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > > + NO_TRANSFER_ACTIVE);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > > + NO_TRANSFER_ACTIVE);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP,
> > > + NO_TRANSFER_ACTIVE);
> > >
> > > result = ehci_reset(hcd);
> > > if (result)
> > > @@ -493,14 +533,11 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > > /* Step 11 passed */
> > >
> > > /* ATL reset */
> > > - hwmode = reg_read32(hcd->regs, HC_HW_MODE_CTRL) & ~ALL_ATX_RESET;
> > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode | ALL_ATX_RESET);
> > > + isp1760_hcd_set(hcd, ALL_ATX_RESET);
> > > mdelay(10);
> > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode);
> > > -
> > > - reg_write32(hcd->regs, HC_INTERRUPT_ENABLE, INTERRUPT_ENABLE_MASK);
> > > + isp1760_hcd_clear(hcd, ALL_ATX_RESET);
> > >
> > > - priv->hcs_params = reg_read32(hcd->regs, HC_HCSPARAMS);
> > > + isp1760_hcd_set(hcd, HC_INT_ENABLE);
> > >
> > > return priv_init(hcd);
> > > }
> > > @@ -730,12 +767,12 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
> > >
> > > /* Make sure done map has not triggered from some unlinked transfer */
> > > if (ptd_offset == ATL_PTD_OFFSET) {
> > > - priv->atl_done_map |= reg_read32(hcd->regs,
> > > - HC_ATL_PTD_DONEMAP_REG);
> > > + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> > > + ISP176x_HC_ATL_PTD_DONEMAP);
> > > priv->atl_done_map &= ~(1 << slot);
> > > } else {
> > > - priv->int_done_map |= reg_read32(hcd->regs,
> > > - HC_INT_PTD_DONEMAP_REG);
> > > + priv->int_done_map |= isp1760_reg_read(priv->regs,
> > > + ISP176x_HC_INT_PTD_DONEMAP);
> > > priv->int_done_map &= ~(1 << slot);
> > > }
> > >
> > > @@ -744,16 +781,20 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
> > > slots[slot].timestamp = jiffies;
> > > slots[slot].qtd = qtd;
> > > slots[slot].qh = qh;
> > > - ptd_write(hcd->regs, ptd_offset, slot, ptd);
> > > + ptd_write(priv->base, ptd_offset, slot, ptd);
> > >
> > > if (ptd_offset == ATL_PTD_OFFSET) {
> > > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > > + skip_map = isp1760_reg_read(priv->regs,
> > > + ISP176x_HC_ATL_PTD_SKIPMAP);
> > > skip_map &= ~(1 << qh->slot);
> > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > > + skip_map);
> > > } else {
> > > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > > + skip_map = isp1760_reg_read(priv->regs,
> > > + ISP176x_HC_INT_PTD_SKIPMAP);
> > > skip_map &= ~(1 << qh->slot);
> > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > > + skip_map);
> > > }
> > > }
> > >
> > > @@ -766,9 +807,10 @@ static int is_short_bulk(struct isp1760_qtd *qtd)
> > > static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> > > struct list_head *urb_list)
> > > {
> > > - int last_qtd;
> > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > struct isp1760_qtd *qtd, *qtd_next;
> > > struct urb_listitem *urb_listitem;
> > > + int last_qtd;
> > >
> > > list_for_each_entry_safe(qtd, qtd_next, &qh->qtd_list, qtd_list) {
> > > if (qtd->status < QTD_XFER_COMPLETE)
> > > @@ -783,9 +825,10 @@ static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> > > if (qtd->actual_length) {
> > > switch (qtd->packet_type) {
> > > case IN_PID:
> > > - mem_reads8(hcd->regs, qtd->payload_addr,
> > > - qtd->data_buffer,
> > > - qtd->actual_length);
> > > + mem_reads8(hcd, priv->base,
> > > + qtd->payload_addr,
> > > + qtd->data_buffer,
> > > + qtd->actual_length);
> > > fallthrough;
> > > case OUT_PID:
> > > qtd->urb->actual_length +=
> > > @@ -873,8 +916,8 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
> > > if ((qtd->length) &&
> > > ((qtd->packet_type == SETUP_PID) ||
> > > (qtd->packet_type == OUT_PID))) {
> > > - mem_writes8(hcd->regs, qtd->payload_addr,
> > > - qtd->data_buffer, qtd->length);
> > > + mem_writes8(priv->base, qtd->payload_addr,
> > > + qtd->data_buffer, qtd->length);
> > > }
> > >
> > > qtd->status = QTD_PAYLOAD_ALLOC;
> > > @@ -1074,9 +1117,9 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > int modified;
> > > int skip_map;
> > >
> > > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > > + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP);
> > > priv->int_done_map &= ~skip_map;
> > > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > > + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP);
> > > priv->atl_done_map &= ~skip_map;
> > >
> > > modified = priv->int_done_map || priv->atl_done_map;
> > > @@ -1094,7 +1137,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > continue;
> > > }
> > > ptd_offset = INT_PTD_OFFSET;
> > > - ptd_read(hcd->regs, INT_PTD_OFFSET, slot, &ptd);
> > > + ptd_read(hcd, priv->base, INT_PTD_OFFSET, slot, &ptd);
> > > state = check_int_transfer(hcd, &ptd,
> > > slots[slot].qtd->urb);
> > > } else {
> > > @@ -1109,7 +1152,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > continue;
> > > }
> > > ptd_offset = ATL_PTD_OFFSET;
> > > - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> > > + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> > > state = check_atl_transfer(hcd, &ptd,
> > > slots[slot].qtd->urb);
> > > }
> > > @@ -1134,7 +1177,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > >
> > > qtd->status = QTD_XFER_COMPLETE;
> > > if (list_is_last(&qtd->qtd_list, &qh->qtd_list) ||
> > > - is_short_bulk(qtd))
> > > + is_short_bulk(qtd))
> > > qtd = NULL;
> > > else
> > > qtd = list_entry(qtd->qtd_list.next,
> > > @@ -1210,13 +1253,15 @@ static irqreturn_t isp1760_irq(struct usb_hcd *hcd)
> > > if (!(hcd->state & HC_STATE_RUNNING))
> > > goto leave;
> > >
> > > - imask = reg_read32(hcd->regs, HC_INTERRUPT_REG);
> > > + imask = isp1760_reg_read(priv->regs, ISP176x_HC_INTERRUPT);
> > > if (unlikely(!imask))
> > > goto leave;
> > > - reg_write32(hcd->regs, HC_INTERRUPT_REG, imask); /* Clear */
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_INTERRUPT, imask); /* Clear */
> > >
> > > - priv->int_done_map |= reg_read32(hcd->regs, HC_INT_PTD_DONEMAP_REG);
> > > - priv->atl_done_map |= reg_read32(hcd->regs, HC_ATL_PTD_DONEMAP_REG);
> > > + priv->int_done_map |= isp1760_reg_read(priv->regs,
> > > + ISP176x_HC_INT_PTD_DONEMAP);
> > > + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> > > + ISP176x_HC_ATL_PTD_DONEMAP);
> > >
> > > handle_done_ptds(hcd);
> > >
> > > @@ -1271,7 +1316,7 @@ static void errata2_function(struct timer_list *unused)
> > > if (priv->atl_slots[slot].qh && time_after(jiffies,
> > > priv->atl_slots[slot].timestamp +
> > > msecs_to_jiffies(SLOT_TIMEOUT))) {
> > > - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> > > + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> > > if (!FROM_DW0_VALID(ptd.dw0) &&
> > > !FROM_DW3_ACTIVE(ptd.dw3))
> > > priv->atl_done_map |= 1 << slot;
> > > @@ -1288,9 +1333,8 @@ static void errata2_function(struct timer_list *unused)
> > >
> > > static int isp1760_run(struct usb_hcd *hcd)
> > > {
> > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > int retval;
> > > - u32 temp;
> > > - u32 command;
> > > u32 chipid;
> > >
> > > hcd->uses_new_polling = 1;
> > > @@ -1298,23 +1342,20 @@ static int isp1760_run(struct usb_hcd *hcd)
> > > hcd->state = HC_STATE_RUNNING;
> > >
> > > /* Set PTD interrupt AND & OR maps */
> > > - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_AND_REG, 0);
> > > - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_OR_REG, 0xffffffff);
> > > - reg_write32(hcd->regs, HC_INT_IRQ_MASK_AND_REG, 0);
> > > - reg_write32(hcd->regs, HC_INT_IRQ_MASK_OR_REG, 0xffffffff);
> > > - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_AND_REG, 0);
> > > - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_OR_REG, 0xffffffff);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_AND, 0);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_OR, 0xffffffff);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_AND, 0);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_OR, 0xffffffff);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_AND, 0);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_OR, 0xffffffff);
> > > /* step 23 passed */
> > >
> > > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp | HW_GLOBAL_INTR_EN);
> > > + isp1760_hcd_set(hcd, HW_GLOBAL_INTR_EN);
> > >
> > > - command = reg_read32(hcd->regs, HC_USBCMD);
> > > - command &= ~(CMD_LRESET|CMD_RESET);
> > > - command |= CMD_RUN;
> > > - reg_write32(hcd->regs, HC_USBCMD, command);
> > > + isp1760_hcd_clear(hcd, CMD_LRESET);
> > > + isp1760_hcd_clear(hcd, CMD_RESET);
> > >
> > > - retval = handshake(hcd, HC_USBCMD, CMD_RUN, CMD_RUN, 250 * 1000);
> > > + retval = isp1760_hcd_set_poll_timeout(hcd, CMD_RUN, 250 * 1000);
> > > if (retval)
> > > return retval;
> > >
> > > @@ -1324,9 +1365,8 @@ static int isp1760_run(struct usb_hcd *hcd)
> > > * the semaphore while doing so.
> > > */
> > > down_write(&ehci_cf_port_reset_rwsem);
> > > - reg_write32(hcd->regs, HC_CONFIGFLAG, FLAG_CF);
> > >
> > > - retval = handshake(hcd, HC_CONFIGFLAG, FLAG_CF, FLAG_CF, 250 * 1000);
> > > + retval = isp1760_hcd_set_poll_timeout(hcd, FLAG_CF, 250 * 1000);
> > > up_write(&ehci_cf_port_reset_rwsem);
> > > if (retval)
> > > return retval;
> > > @@ -1336,21 +1376,22 @@ static int isp1760_run(struct usb_hcd *hcd)
> > > errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
> > > add_timer(&errata2_timer);
> > >
> > > - chipid = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> > > + chipid = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> > > dev_info(hcd->self.controller, "USB ISP %04x HW rev. %d started\n",
> > > chipid & 0xffff, chipid >> 16);
> > >
> > > /* PTD Register Init Part 2, Step 28 */
> > >
> > > /* Setup registers controlling PTD checking */
> > > - reg_write32(hcd->regs, HC_ATL_PTD_LASTPTD_REG, 0x80000000);
> > > - reg_write32(hcd->regs, HC_INT_PTD_LASTPTD_REG, 0x80000000);
> > > - reg_write32(hcd->regs, HC_ISO_PTD_LASTPTD_REG, 0x00000001);
> > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, 0xffffffff);
> > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, 0xffffffff);
> > > - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, 0xffffffff);
> > > - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG,
> > > - ATL_BUF_FILL | INT_BUF_FILL);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_LASTPTD, 0x80000000);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_LASTPTD, 0x80000000);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_LASTPTD, 0x00000001);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP, 0xffffffff);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP, 0xffffffff);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP, 0xffffffff);
> > > +
> > > + isp1760_hcd_set(hcd, ATL_BUF_FILL);
> > > + isp1760_hcd_set(hcd, INT_BUF_FILL);
> > >
> > > /* GRR this is run-once init(), being done every time the HC starts.
> > > * So long as they're part of class devices, we can't do it init()
> > > @@ -1584,15 +1625,19 @@ static void kill_transfer(struct usb_hcd *hcd, struct urb *urb,
> > > /* We need to forcefully reclaim the slot since some transfers never
> > > return, e.g. interrupt transfers and NAKed bulk transfers. */
> > > if (usb_pipecontrol(urb->pipe) || usb_pipebulk(urb->pipe)) {
> > > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > > + skip_map = isp1760_reg_read(priv->regs,
> > > + ISP176x_HC_ATL_PTD_SKIPMAP);
> > > skip_map |= (1 << qh->slot);
> > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > > + skip_map);
> > > priv->atl_slots[qh->slot].qh = NULL;
> > > priv->atl_slots[qh->slot].qtd = NULL;
> > > } else {
> > > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > > + skip_map = isp1760_reg_read(priv->regs,
> > > + ISP176x_HC_INT_PTD_SKIPMAP);
> > > skip_map |= (1 << qh->slot);
> > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > > + skip_map);
> > > priv->int_slots[qh->slot].qh = NULL;
> > > priv->int_slots[qh->slot].qtd = NULL;
> > > }
> > > @@ -1705,8 +1750,7 @@ static void isp1760_endpoint_disable(struct usb_hcd *hcd,
> > > static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > {
> > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > - u32 temp, status = 0;
> > > - u32 mask;
> > > + u32 status = 0;
> > > int retval = 1;
> > > unsigned long flags;
> > >
> > > @@ -1716,17 +1760,13 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > >
> > > /* init status to no-changes */
> > > buf[0] = 0;
> > > - mask = PORT_CSC;
> > >
> > > spin_lock_irqsave(&priv->lock, flags);
> > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > >
> > > - if (temp & PORT_OWNER) {
> > > - if (temp & PORT_CSC) {
> > > - temp &= ~PORT_CSC;
> > > - reg_write32(hcd->regs, HC_PORTSC1, temp);
> > > - goto done;
> > > - }
> > > + if (isp1760_hcd_is_set(hcd, PORT_OWNER) &&
> > > + isp1760_hcd_is_set(hcd, PORT_CSC)) {
> > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > + goto done;
> > > }
> > >
> > > /*
> > > @@ -1735,11 +1775,9 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > * high-speed device is switched over to the companion
> > > * controller by the user.
> > > */
> > > -
> > > - if ((temp & mask) != 0
> > > - || ((temp & PORT_RESUME) != 0
> > > - && time_after_eq(jiffies,
> > > - priv->reset_done))) {
> > > + if (isp1760_hcd_is_set(hcd, PORT_CSC) ||
> > > + (isp1760_hcd_is_set(hcd, PORT_RESUME) &&
> > > + time_after_eq(jiffies, priv->reset_done))) {
> > > buf [0] |= 1 << (0 + 1);
> > > status = STS_PCD;
> > > }
> > > @@ -1752,9 +1790,11 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > > struct usb_hub_descriptor *desc)
> > > {
> > > - int ports = HCS_N_PORTS(priv->hcs_params);
> > > + int ports;
> > > u16 temp;
> > >
> > > + ports = isp1760_hcd_read(priv->hcd, HCS_N_PORTS);
> > > +
> > > desc->bDescriptorType = USB_DT_HUB;
> > > /* priv 1.0, 2.3.9 says 20ms max */
> > > desc->bPwrOn2PwrGood = 10;
> > > @@ -1770,7 +1810,7 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > >
> > > /* per-port overcurrent reporting */
> > > temp = HUB_CHAR_INDV_PORT_OCPM;
> > > - if (HCS_PPC(priv->hcs_params))
> > > + if (isp1760_hcd_is_set(priv->hcd, HCS_PPC))
> > > /* per-port power control */
> > > temp |= HUB_CHAR_INDV_PORT_LPSM;
> > > else
> > > @@ -1781,38 +1821,37 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > >
> > > #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)
> > >
> > > -static int check_reset_complete(struct usb_hcd *hcd, int index,
> > > - int port_status)
> > > +static void check_reset_complete(struct usb_hcd *hcd, int index)
> > > {
> > > - if (!(port_status & PORT_CONNECT))
> > > - return port_status;
> > > + if (!(isp1760_hcd_is_set(hcd, PORT_CONNECT)))
> > > + return;
> > >
> > > /* if reset finished and it's still not enabled -- handoff */
> > > - if (!(port_status & PORT_PE)) {
> > > -
> > > + if (!isp1760_hcd_is_set(hcd, PORT_PE)) {
> > > dev_info(hcd->self.controller,
> > > "port %d full speed --> companion\n",
> > > index + 1);
> > >
> > > - port_status |= PORT_OWNER;
> > > - port_status &= ~PORT_RWC_BITS;
> > > - reg_write32(hcd->regs, HC_PORTSC1, port_status);
> > > + isp1760_hcd_set(hcd, PORT_OWNER);
> > >
> > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > } else
> > > dev_info(hcd->self.controller, "port %d high speed\n",
> > > index + 1);
> > >
> > > - return port_status;
> > > + return;
> > > }
> > >
> > > static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > u16 wValue, u16 wIndex, char *buf, u16 wLength)
> > > {
> > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > - int ports = HCS_N_PORTS(priv->hcs_params);
> > > - u32 temp, status;
> > > + u32 status;
> > > unsigned long flags;
> > > int retval = 0;
> > > + int ports;
> > > +
> > > + ports = isp1760_hcd_read(hcd, HCS_N_PORTS);
> > >
> > > /*
> > > * FIXME: support SetPortFeatures USB_PORT_FEAT_INDICATOR.
> > > @@ -1837,7 +1876,6 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > if (!wIndex || wIndex > ports)
> > > goto error;
> > > wIndex--;
> > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > >
> > > /*
> > > * Even if OWNER is set, so the port is owned by the
> > > @@ -1848,22 +1886,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > >
> > > switch (wValue) {
> > > case USB_PORT_FEAT_ENABLE:
> > > - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_PE);
> > > + isp1760_hcd_clear(hcd, PORT_PE);
> > > break;
> > > case USB_PORT_FEAT_C_ENABLE:
> > > /* XXX error? */
> > > break;
> > > case USB_PORT_FEAT_SUSPEND:
> > > - if (temp & PORT_RESET)
> > > + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> > > goto error;
> > >
> > > - if (temp & PORT_SUSPEND) {
> > > - if ((temp & PORT_PE) == 0)
> > > + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND)) {
> > > + if (!isp1760_hcd_is_set(hcd, PORT_PE))
> > > goto error;
> > > /* resume signaling for 20 msec */
> > > - temp &= ~(PORT_RWC_BITS);
> > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > - temp | PORT_RESUME);
> > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > + isp1760_hcd_set(hcd, PORT_RESUME);
> > > +
> > > priv->reset_done = jiffies +
> > > msecs_to_jiffies(USB_RESUME_TIMEOUT);
> > > }
> > > @@ -1872,12 +1910,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > /* we auto-clear this feature */
> > > break;
> > > case USB_PORT_FEAT_POWER:
> > > - if (HCS_PPC(priv->hcs_params))
> > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > - temp & ~PORT_POWER);
> > > + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> > > + isp1760_hcd_clear(hcd, PORT_POWER);
> > > break;
> > > case USB_PORT_FEAT_C_CONNECTION:
> > > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_CSC);
> > > + isp1760_hcd_set(hcd, PORT_CSC);
> > > break;
> > > case USB_PORT_FEAT_C_OVER_CURRENT:
> > > /* XXX error ?*/
> > > @@ -1888,7 +1925,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > default:
> > > goto error;
> > > }
> > > - reg_read32(hcd->regs, HC_USBCMD);
> > > + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> > > break;
> > > case GetHubDescriptor:
> > > isp1760_hub_descriptor(priv, (struct usb_hub_descriptor *)
> > > @@ -1903,15 +1940,14 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > goto error;
> > > wIndex--;
> > > status = 0;
> > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > >
> > > /* wPortChange bits */
> > > - if (temp & PORT_CSC)
> > > + if (isp1760_hcd_is_set(hcd, PORT_CSC))
> > > status |= USB_PORT_STAT_C_CONNECTION << 16;
> > >
> > >
> > > /* whoever resumes must GetPortStatus to complete it!! */
> > > - if (temp & PORT_RESUME) {
> > > + if (isp1760_hcd_is_set(hcd, PORT_RESUME)) {
> > > dev_err(hcd->self.controller, "Port resume should be skipped.\n");
> > >
> > > /* Remote Wakeup received? */
> > > @@ -1930,35 +1966,31 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > priv->reset_done = 0;
> > >
> > > /* stop resume signaling */
> > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > - temp & ~(PORT_RWC_BITS | PORT_RESUME));
> > > - retval = handshake(hcd, HC_PORTSC1,
> > > - PORT_RESUME, 0, 2000 /* 2msec */);
> > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > +
> > > + retval = isp1760_hcd_clear_poll_timeout(hcd,
> > > + PORT_RESUME, 2000);
> > > if (retval != 0) {
> > > dev_err(hcd->self.controller,
> > > "port %d resume error %d\n",
> > > wIndex + 1, retval);
> > > goto error;
> > > }
> > > - temp &= ~(PORT_SUSPEND|PORT_RESUME|(3<<10));
> > > }
> > > }
> > >
> > > /* whoever resets must GetPortStatus to complete it!! */
> > > - if ((temp & PORT_RESET)
> > > - && time_after_eq(jiffies,
> > > - priv->reset_done)) {
> > > + if (isp1760_hcd_is_set(hcd, PORT_RESET) &&
> > > + time_after_eq(jiffies, priv->reset_done)) {
> > > status |= USB_PORT_STAT_C_RESET << 16;
> > > priv->reset_done = 0;
> > >
> > > /* force reset to complete */
> > > - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_RESET);
> > > /* REVISIT: some hardware needs 550+ usec to clear
> > > * this bit; seems too long to spin routinely...
> > > */
> > > - retval = handshake(hcd, HC_PORTSC1,
> > > - PORT_RESET, 0, 750);
> > > + retval = isp1760_hcd_clear_poll_timeout(hcd, PORT_RESET,
> > > + 750);
> > > if (retval != 0) {
> > > dev_err(hcd->self.controller, "port %d reset error %d\n",
> > > wIndex + 1, retval);
> > > @@ -1966,8 +1998,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > }
> > >
> > > /* see what we found out */
> > > - temp = check_reset_complete(hcd, wIndex,
> > > - reg_read32(hcd->regs, HC_PORTSC1));
> > > + check_reset_complete(hcd, wIndex);
> > > }
> > > /*
> > > * Even if OWNER is set, there's no harm letting hub_wq
> > > @@ -1975,21 +2006,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > * for PORT_POWER anyway).
> > > */
> > >
> > > - if (temp & PORT_OWNER)
> > > + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> > > dev_err(hcd->self.controller, "PORT_OWNER is set\n");
> > >
> > > - if (temp & PORT_CONNECT) {
> > > + if (isp1760_hcd_is_set(hcd, PORT_CONNECT)) {
> > > status |= USB_PORT_STAT_CONNECTION;
> > > /* status may be from integrated TT */
> > > status |= USB_PORT_STAT_HIGH_SPEED;
> > > }
> > > - if (temp & PORT_PE)
> > > + if (isp1760_hcd_is_set(hcd, PORT_PE))
> > > status |= USB_PORT_STAT_ENABLE;
> > > - if (temp & (PORT_SUSPEND|PORT_RESUME))
> > > + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND) &&
> > > + isp1760_hcd_is_set(hcd, PORT_RESUME))
> > > status |= USB_PORT_STAT_SUSPEND;
> > > - if (temp & PORT_RESET)
> > > + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> > > status |= USB_PORT_STAT_RESET;
> > > - if (temp & PORT_POWER)
> > > + if (isp1760_hcd_is_set(hcd, PORT_POWER))
> > > status |= USB_PORT_STAT_POWER;
> > >
> > > put_unaligned(cpu_to_le32(status), (__le32 *) buf);
> > > @@ -2009,41 +2041,39 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > if (!wIndex || wIndex > ports)
> > > goto error;
> > > wIndex--;
> > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > - if (temp & PORT_OWNER)
> > > + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> > > break;
> > >
> > > -/* temp &= ~PORT_RWC_BITS; */
> > > switch (wValue) {
> > > case USB_PORT_FEAT_ENABLE:
> > > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_PE);
> > > + isp1760_hcd_set(hcd, PORT_PE);
> > > break;
> > >
> > > case USB_PORT_FEAT_SUSPEND:
> > > - if ((temp & PORT_PE) == 0
> > > - || (temp & PORT_RESET) != 0)
> > > + if (!isp1760_hcd_is_set(hcd, PORT_PE) ||
> > > + isp1760_hcd_is_set(hcd, PORT_RESET))
> > > goto error;
> > >
> > > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_SUSPEND);
> > > + isp1760_hcd_set(hcd, PORT_SUSPEND);
> > > break;
> > > case USB_PORT_FEAT_POWER:
> > > - if (HCS_PPC(priv->hcs_params))
> > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > - temp | PORT_POWER);
> > > + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> > > + isp1760_hcd_set(hcd, PORT_POWER);
> > > break;
> > > case USB_PORT_FEAT_RESET:
> > > - if (temp & PORT_RESUME)
> > > + if (isp1760_hcd_is_set(hcd, PORT_RESUME))
> > > goto error;
> > > /* line status bits may report this as low speed,
> > > * which can be fine if this root hub has a
> > > * transaction translator built in.
> > > */
> > > - if ((temp & (PORT_PE|PORT_CONNECT)) == PORT_CONNECT
> > > - && PORT_USB11(temp)) {
> > > - temp |= PORT_OWNER;
> > > + if ((isp1760_hcd_is_set(hcd, PORT_CONNECT) &&
> > > + !isp1760_hcd_is_set(hcd, PORT_PE)) &&
> > > + (isp1760_hcd_read(hcd, PORT_LSTATUS) == 1)) {
> > > + isp1760_hcd_set(hcd, PORT_OWNER);
> > > } else {
> > > - temp |= PORT_RESET;
> > > - temp &= ~PORT_PE;
> > > + isp1760_hcd_set(hcd, PORT_RESET);
> > > + isp1760_hcd_clear(hcd, PORT_PE);
> > >
> > > /*
> > > * caller must wait, then call GetPortStatus
> > > @@ -2052,12 +2082,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > priv->reset_done = jiffies +
> > > msecs_to_jiffies(50);
> > > }
> > > - reg_write32(hcd->regs, HC_PORTSC1, temp);
> > > break;
> > > default:
> > > goto error;
> > > }
> > > - reg_read32(hcd->regs, HC_USBCMD);
> > > + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> > > break;
> > >
> > > default:
> > > @@ -2074,14 +2103,13 @@ static int isp1760_get_frame(struct usb_hcd *hcd)
> > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > u32 fr;
> > >
> > > - fr = reg_read32(hcd->regs, HC_FRINDEX);
> > > + fr = isp1760_hcd_read(hcd, HC_FRINDEX);
> > > return (fr >> 3) % priv->periodic_size;
> > > }
> > >
> > > static void isp1760_stop(struct usb_hcd *hcd)
> > > {
> > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > - u32 temp;
> > >
> > > del_timer(&errata2_timer);
> > >
> > > @@ -2092,24 +2120,19 @@ static void isp1760_stop(struct usb_hcd *hcd)
> > > spin_lock_irq(&priv->lock);
> > > ehci_reset(hcd);
> > > /* Disable IRQ */
> > > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
> > > + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> > > spin_unlock_irq(&priv->lock);
> > >
> > > - reg_write32(hcd->regs, HC_CONFIGFLAG, 0);
> > > + isp1760_hcd_clear(hcd, FLAG_CF);
> > > }
> > >
> > > static void isp1760_shutdown(struct usb_hcd *hcd)
> > > {
> > > - u32 command, temp;
> > > -
> > > isp1760_stop(hcd);
> > > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
> > >
> > > - command = reg_read32(hcd->regs, HC_USBCMD);
> > > - command &= ~CMD_RUN;
> > > - reg_write32(hcd->regs, HC_USBCMD, command);
> > > + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> > > +
> > > + isp1760_hcd_clear(hcd, CMD_RUN);
> > > }
> > >
> > > static void isp1760_clear_tt_buffer_complete(struct usb_hcd *hcd,
> > > @@ -2182,8 +2205,8 @@ void isp1760_deinit_kmem_cache(void)
> > > kmem_cache_destroy(urb_listitem_cachep);
> > > }
> > >
> > > -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > > - struct resource *mem, int irq, unsigned long irqflags,
> > > +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> > > + int irq, unsigned long irqflags,
> > > struct device *dev)
> > > {
> > > struct usb_hcd *hcd;
> > > @@ -2200,7 +2223,6 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > > init_memory(priv);
> > >
> > > hcd->irq = irq;
> > > - hcd->regs = regs;
> > > hcd->rsrc_start = mem->start;
> > > hcd->rsrc_len = resource_size(mem);
> > >
> > > diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
> > > index f1bb2deb1ccf..34e1899e52c4 100644
> > > --- a/drivers/usb/isp1760/isp1760-hcd.h
> > > +++ b/drivers/usb/isp1760/isp1760-hcd.h
> > > @@ -3,6 +3,9 @@
> > > #define _ISP1760_HCD_H_
> > >
> > > #include <linux/spinlock.h>
> > > +#include <linux/regmap.h>
> > > +
> > > +#include "isp1760-regs.h"
> > >
> > > struct isp1760_qh;
> > > struct isp1760_qtd;
> > > @@ -48,10 +51,13 @@ enum isp1760_queue_head_types {
> > > };
> > >
> > > struct isp1760_hcd {
> > > -#ifdef CONFIG_USB_ISP1760_HCD
> > > struct usb_hcd *hcd;
> > >
> > > - u32 hcs_params;
> > > + void __iomem *base;
> > > +
> > > + struct regmap *regs;
> > > + struct regmap_field *fields[HC_FIELD_MAX];
> > > +
> > > spinlock_t lock;
> > > struct isp1760_slotinfo atl_slots[32];
> > > int atl_done_map;
> > > @@ -66,20 +72,18 @@ struct isp1760_hcd {
> > > unsigned i_thresh;
> > > unsigned long reset_done;
> > > unsigned long next_statechange;
> > > -#endif
> > > };
> > >
> > > #ifdef CONFIG_USB_ISP1760_HCD
> > > -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > > - struct resource *mem, int irq, unsigned long irqflags,
> > > - struct device *dev);
> > > +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> > > + int irq, unsigned long irqflags, struct device *dev);
> > > void isp1760_hcd_unregister(struct isp1760_hcd *priv);
> > >
> > > int isp1760_init_kmem_once(void);
> > > void isp1760_deinit_kmem_cache(void);
> > > #else
> > > static inline int isp1760_hcd_register(struct isp1760_hcd *priv,
> > > - void __iomem *regs, struct resource *mem,
> > > + struct resource *mem,
> > > int irq, unsigned long irqflags,
> > > struct device *dev)
> > > {
> > > diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
> > > index ccd30f835888..abfba9f5ec23 100644
> > > --- a/drivers/usb/isp1760/isp1760-if.c
> > > +++ b/drivers/usb/isp1760/isp1760-if.c
> > > @@ -75,9 +75,9 @@ static int isp1761_pci_init(struct pci_dev *dev)
> > > /*by default host is in 16bit mode, so
> > > * io operations at this stage must be 16 bit
> > > * */
> > > - writel(0xface, iobase + HC_SCRATCH_REG);
> > > + writel(0xface, iobase + ISP176x_HC_SCRATCH);
> > > udelay(100);
> > > - reg_data = readl(iobase + HC_SCRATCH_REG) & 0x0000ffff;
> > > + reg_data = readl(iobase + ISP176x_HC_SCRATCH) & 0x0000ffff;
> > > retry_count--;
> > > }
> > >
> > > diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
> > > index fedc4f5cded0..42ee4404c90b 100644
> > > --- a/drivers/usb/isp1760/isp1760-regs.h
> > > +++ b/drivers/usb/isp1760/isp1760-regs.h
> > > @@ -10,218 +10,286 @@
> > > * Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > */
> > >
> > > -#ifndef _ISP1760_REGS_H_
> > > -#define _ISP1760_REGS_H_
> > > +#ifndef _ISP176x_REGS_H_
> > > +#define _ISP176x_REGS_H_
> > > +
> > > +#include <linux/regmap.h>
> > >
> > > /* -----------------------------------------------------------------------------
> > > * Host Controller
> > > */
> > >
> > > /* EHCI capability registers */
> > > -#define HC_CAPLENGTH 0x000
> > > -#define HC_LENGTH(p) (((p) >> 00) & 0x00ff) /* bits 7:0 */
> > > -#define HC_VERSION(p) (((p) >> 16) & 0xffff) /* bits 31:16 */
> > > -
> > > -#define HC_HCSPARAMS 0x004
> > > -#define HCS_INDICATOR(p) ((p) & (1 << 16)) /* true: has port indicators */
> > > -#define HCS_PPC(p) ((p) & (1 << 4)) /* true: port power control */
> > > -#define HCS_N_PORTS(p) (((p) >> 0) & 0xf) /* bits 3:0, ports on HC */
> > > -
> > > -#define HC_HCCPARAMS 0x008
> > > -#define HCC_ISOC_CACHE(p) ((p) & (1 << 7)) /* true: can cache isoc frame */
> > > -#define HCC_ISOC_THRES(p) (((p) >> 4) & 0x7) /* bits 6:4, uframes cached */
> > > +#define ISP176x_HC_CAPLENGTH 0x000
> > > +#define ISP176x_HC_VERSION 0x002
> > > +#define ISP176x_HC_HCSPARAMS 0x004
> > > +#define ISP176x_HC_HCCPARAMS 0x008
> > >
> > > /* EHCI operational registers */
> > > -#define HC_USBCMD 0x020
> > > -#define CMD_LRESET (1 << 7) /* partial reset (no ports, etc) */
> > > -#define CMD_RESET (1 << 1) /* reset HC not bus */
> > > -#define CMD_RUN (1 << 0) /* start/stop HC */
> > > -
> > > -#define HC_USBSTS 0x024
> > > -#define STS_PCD (1 << 2) /* port change detect */
> > > -
> > > -#define HC_FRINDEX 0x02c
> > > -
> > > -#define HC_CONFIGFLAG 0x060
> > > -#define FLAG_CF (1 << 0) /* true: we'll support "high speed" */
> > > -
> > > -#define HC_PORTSC1 0x064
> > > -#define PORT_OWNER (1 << 13) /* true: companion hc owns this port */
> > > -#define PORT_POWER (1 << 12) /* true: has power (see PPC) */
> > > -#define PORT_USB11(x) (((x) & (3 << 10)) == (1 << 10)) /* USB 1.1 device */
> > > -#define PORT_RESET (1 << 8) /* reset port */
> > > -#define PORT_SUSPEND (1 << 7) /* suspend port */
> > > -#define PORT_RESUME (1 << 6) /* resume it */
> > > -#define PORT_PE (1 << 2) /* port enable */
> > > -#define PORT_CSC (1 << 1) /* connect status change */
> > > -#define PORT_CONNECT (1 << 0) /* device connected */
> > > -#define PORT_RWC_BITS (PORT_CSC)
> > > -
> > > -#define HC_ISO_PTD_DONEMAP_REG 0x130
> > > -#define HC_ISO_PTD_SKIPMAP_REG 0x134
> > > -#define HC_ISO_PTD_LASTPTD_REG 0x138
> > > -#define HC_INT_PTD_DONEMAP_REG 0x140
> > > -#define HC_INT_PTD_SKIPMAP_REG 0x144
> > > -#define HC_INT_PTD_LASTPTD_REG 0x148
> > > -#define HC_ATL_PTD_DONEMAP_REG 0x150
> > > -#define HC_ATL_PTD_SKIPMAP_REG 0x154
> > > -#define HC_ATL_PTD_LASTPTD_REG 0x158
> > > +#define ISP176x_HC_USBCMD 0x020
> > > +#define ISP176x_HC_USBSTS 0x024
> > > +#define ISP176x_HC_FRINDEX 0x02c
> > > +
> > > +#define ISP176x_HC_CONFIGFLAG 0x060
> > > +#define ISP176x_HC_PORTSC1 0x064
> > > +
> > > +#define ISP176x_HC_ISO_PTD_DONEMAP 0x130
> > > +#define ISP176x_HC_ISO_PTD_SKIPMAP 0x134
> > > +#define ISP176x_HC_ISO_PTD_LASTPTD 0x138
> > > +#define ISP176x_HC_INT_PTD_DONEMAP 0x140
> > > +#define ISP176x_HC_INT_PTD_SKIPMAP 0x144
> > > +#define ISP176x_HC_INT_PTD_LASTPTD 0x148
> > > +#define ISP176x_HC_ATL_PTD_DONEMAP 0x150
> > > +#define ISP176x_HC_ATL_PTD_SKIPMAP 0x154
> > > +#define ISP176x_HC_ATL_PTD_LASTPTD 0x158
> > >
> > > /* Configuration Register */
> > > -#define HC_HW_MODE_CTRL 0x300
> > > -#define ALL_ATX_RESET (1 << 31)
> > > -#define HW_ANA_DIGI_OC (1 << 15)
> > > -#define HW_DEV_DMA (1 << 11)
> > > -#define HW_COMN_IRQ (1 << 10)
> > > -#define HW_COMN_DMA (1 << 9)
> > > -#define HW_DATA_BUS_32BIT (1 << 8)
> > > -#define HW_DACK_POL_HIGH (1 << 6)
> > > -#define HW_DREQ_POL_HIGH (1 << 5)
> > > -#define HW_INTR_HIGH_ACT (1 << 2)
> > > -#define HW_INTR_EDGE_TRIG (1 << 1)
> > > -#define HW_GLOBAL_INTR_EN (1 << 0)
> > > -
> > > -#define HC_CHIP_ID_REG 0x304
> > > -#define HC_SCRATCH_REG 0x308
> > > -
> > > -#define HC_RESET_REG 0x30c
> > > -#define SW_RESET_RESET_HC (1 << 1)
> > > -#define SW_RESET_RESET_ALL (1 << 0)
> > > -
> > > -#define HC_BUFFER_STATUS_REG 0x334
> > > -#define ISO_BUF_FILL (1 << 2)
> > > -#define INT_BUF_FILL (1 << 1)
> > > -#define ATL_BUF_FILL (1 << 0)
> > > -
> > > -#define HC_MEMORY_REG 0x33c
> > > -#define ISP_BANK(x) ((x) << 16)
> > > -
> > > -#define HC_PORT1_CTRL 0x374
> > > -#define PORT1_POWER (3 << 3)
> > > -#define PORT1_INIT1 (1 << 7)
> > > -#define PORT1_INIT2 (1 << 23)
> > > -#define HW_OTG_CTRL_SET 0x374
> > > -#define HW_OTG_CTRL_CLR 0x376
> > > -#define HW_OTG_DISABLE (1 << 10)
> > > -#define HW_OTG_SE0_EN (1 << 9)
> > > -#define HW_BDIS_ACON_EN (1 << 8)
> > > -#define HW_SW_SEL_HC_DC (1 << 7)
> > > -#define HW_VBUS_CHRG (1 << 6)
> > > -#define HW_VBUS_DISCHRG (1 << 5)
> > > -#define HW_VBUS_DRV (1 << 4)
> > > -#define HW_SEL_CP_EXT (1 << 3)
> > > -#define HW_DM_PULLDOWN (1 << 2)
> > > -#define HW_DP_PULLDOWN (1 << 1)
> > > -#define HW_DP_PULLUP (1 << 0)
> > > +#define ISP176x_HC_HW_MODE_CTRL 0x300
> > > +#define ISP176x_HC_CHIP_ID 0x304
> > > +#define ISP176x_HC_SCRATCH 0x308
> > > +#define ISP176x_HC_RESET 0x30c
> > > +#define ISP176x_HC_BUFFER_STATUS 0x334
> > > +#define ISP176x_HC_MEMORY 0x33c
> > >
> > > /* Interrupt Register */
> > > -#define HC_INTERRUPT_REG 0x310
> > > -
> > > -#define HC_INTERRUPT_ENABLE 0x314
> > > -#define HC_ISO_INT (1 << 9)
> > > -#define HC_ATL_INT (1 << 8)
> > > -#define HC_INTL_INT (1 << 7)
> > > -#define HC_EOT_INT (1 << 3)
> > > -#define HC_SOT_INT (1 << 1)
> > > -#define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT)
> > > -
> > > -#define HC_ISO_IRQ_MASK_OR_REG 0x318
> > > -#define HC_INT_IRQ_MASK_OR_REG 0x31c
> > > -#define HC_ATL_IRQ_MASK_OR_REG 0x320
> > > -#define HC_ISO_IRQ_MASK_AND_REG 0x324
> > > -#define HC_INT_IRQ_MASK_AND_REG 0x328
> > > -#define HC_ATL_IRQ_MASK_AND_REG 0x32c
> > > +#define ISP176x_HC_INTERRUPT 0x310
> > > +#define ISP176x_HC_INTERRUPT_ENABLE 0x314
> > > +#define ISP176x_HC_ISO_IRQ_MASK_OR 0x318
> > > +#define ISP176x_HC_INT_IRQ_MASK_OR 0x31c
> > > +#define ISP176x_HC_ATL_IRQ_MASK_OR 0x320
> > > +#define ISP176x_HC_ISO_IRQ_MASK_AND 0x324
> > > +#define ISP176x_HC_INT_IRQ_MASK_AND 0x328
> > > +#define ISP176x_HC_ATL_IRQ_MASK_AND 0x32c
> > > +
> > > +static const struct regmap_range isp176x_hc_volatile_ranges[] = {
> > > + regmap_reg_range(ISP176x_HC_USBCMD, ISP176x_HC_ATL_PTD_LASTPTD),
> > > + regmap_reg_range(ISP176x_HC_BUFFER_STATUS, ISP176x_HC_MEMORY),
> > > + regmap_reg_range(ISP176x_HC_INTERRUPT, ISP176x_HC_ATL_IRQ_MASK_AND),
> > > +};
> > > +
> > > +static const struct regmap_access_table isp176x_hc_volatile_table = {
> > > + .yes_ranges = isp176x_hc_volatile_ranges,
> > > + .n_yes_ranges = ARRAY_SIZE(isp176x_hc_volatile_ranges),
> > > +};
> >
> > These belong to a .c file.
>
> yup, can move them and all below.
>
> >
> > > +
> > > +enum isp176x_host_controller_fields {
> > > + /* HC_HCSPARAMS */
> > > + HCS_PPC, HCS_N_PORTS,
> > > + /* HC_HCCPARAMS */
> > > + HCC_ISOC_CACHE, HCC_ISOC_THRES,
> > > + /* HC_USBCMD */
> > > + CMD_LRESET, CMD_RESET, CMD_RUN,
> > > + /* HC_USBSTS */
> > > + STS_PCD,
> > > + /* HC_FRINDEX */
> > > + HC_FRINDEX,
> > > + /* HC_CONFIGFLAG */
> > > + FLAG_CF,
> > > + /* HC_PORTSC1 */
> > > + PORT_OWNER, PORT_POWER, PORT_LSTATUS, PORT_RESET, PORT_SUSPEND,
> > > + PORT_RESUME, PORT_PE, PORT_CSC, PORT_CONNECT,
> > > + /* HC_HW_MODE_CTRL */
> > > + ALL_ATX_RESET, HW_ANA_DIGI_OC, HW_DEV_DMA, HW_COMN_IRQ, HW_COMN_DMA,
> > > + HW_DATA_BUS_WIDTH, HW_DACK_POL_HIGH, HW_DREQ_POL_HIGH, HW_INTR_HIGH_ACT,
> > > + HW_INTR_EDGE_TRIG, HW_GLOBAL_INTR_EN,
> > > + /* HC_RESET */
> > > + SW_RESET_RESET_HC, SW_RESET_RESET_ALL,
> > > + /* HC_BUFFER_STATUS */
> > > + INT_BUF_FILL, ATL_BUF_FILL,
> > > + /* HC_MEMORY */
> > > + MEM_BANK_SEL, MEM_START_ADDR,
> > > + /* HC_INTERRUPT_ENABLE */
> > > + HC_INT_ENABLE,
> > > + /* Last element */
> > > + HC_FIELD_MAX,
> > > +};
> > > +
> > > +static const struct reg_field isp1760_hc_reg_fields[] = {
> > > + [HCS_PPC] = REG_FIELD(ISP176x_HC_HCSPARAMS, 4, 4),
> > > + [HCS_N_PORTS] = REG_FIELD(ISP176x_HC_HCSPARAMS, 0, 3),
> > > + [HCC_ISOC_CACHE] = REG_FIELD(ISP176x_HC_HCCPARAMS, 7, 7),
> > > + [HCC_ISOC_THRES] = REG_FIELD(ISP176x_HC_HCCPARAMS, 4, 6),
> > > + [CMD_LRESET] = REG_FIELD(ISP176x_HC_USBCMD, 7, 7),
> > > + [CMD_RESET] = REG_FIELD(ISP176x_HC_USBCMD, 1, 1),
> > > + [CMD_RUN] = REG_FIELD(ISP176x_HC_USBCMD, 0, 0),
> > > + [STS_PCD] = REG_FIELD(ISP176x_HC_USBSTS, 2, 2),
> > > + [HC_FRINDEX] = REG_FIELD(ISP176x_HC_FRINDEX, 0, 13),
> > > + [FLAG_CF] = REG_FIELD(ISP176x_HC_CONFIGFLAG, 0, 0),
> > > + [PORT_OWNER] = REG_FIELD(ISP176x_HC_PORTSC1, 13, 13),
> > > + [PORT_POWER] = REG_FIELD(ISP176x_HC_PORTSC1, 12, 12),
> > > + [PORT_LSTATUS] = REG_FIELD(ISP176x_HC_PORTSC1, 10, 11),
> > > + [PORT_RESET] = REG_FIELD(ISP176x_HC_PORTSC1, 8, 8),
> > > + [PORT_SUSPEND] = REG_FIELD(ISP176x_HC_PORTSC1, 7, 7),
> > > + [PORT_RESUME] = REG_FIELD(ISP176x_HC_PORTSC1, 6, 6),
> > > + [PORT_PE] = REG_FIELD(ISP176x_HC_PORTSC1, 2, 2),
> > > + [PORT_CSC] = REG_FIELD(ISP176x_HC_PORTSC1, 1, 1),
> > > + [PORT_CONNECT] = REG_FIELD(ISP176x_HC_PORTSC1, 0, 0),
> > > + [ALL_ATX_RESET] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 31, 31),
> > > + [HW_ANA_DIGI_OC] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 15, 15),
> > > + [HW_COMN_IRQ] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 10, 10),
> > > + [HW_DATA_BUS_WIDTH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 8, 8),
> > > + [HW_DACK_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 6, 6),
> > > + [HW_DREQ_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 5, 5),
> > > + [HW_INTR_HIGH_ACT] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 2, 2),
> > > + [HW_INTR_EDGE_TRIG] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 1, 1),
> > > + [HW_GLOBAL_INTR_EN] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 0, 0),
> > > + [SW_RESET_RESET_ALL] = REG_FIELD(ISP176x_HC_RESET, 0, 0),
> > > + [INT_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 1, 1),
> > > + [ATL_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 0, 0),
> > > + [MEM_BANK_SEL] = REG_FIELD(ISP176x_HC_MEMORY, 16, 17),
> > > + [MEM_START_ADDR] = REG_FIELD(ISP176x_HC_MEMORY, 0, 15),
> > > + [HC_INT_ENABLE] = REG_FIELD(ISP176x_HC_INTERRUPT_ENABLE, 7, 8),
> > > +};
> >
> > This too.
> >
> > >
> > > /* -----------------------------------------------------------------------------
> > > * Peripheral Controller
> > > */
> > >
> > > -/* Initialization Registers */
> > > -#define DC_ADDRESS 0x0200
> > > -#define DC_DEVEN (1 << 7)
> > > -
> > > -#define DC_MODE 0x020c
> > > -#define DC_DMACLKON (1 << 9)
> > > -#define DC_VBUSSTAT (1 << 8)
> > > -#define DC_CLKAON (1 << 7)
> > > -#define DC_SNDRSU (1 << 6)
> > > -#define DC_GOSUSP (1 << 5)
> > > -#define DC_SFRESET (1 << 4)
> > > -#define DC_GLINTENA (1 << 3)
> > > -#define DC_WKUPCS (1 << 2)
> > > -
> > > -#define DC_INTCONF 0x0210
> > > -#define DC_CDBGMOD_ACK_NAK (0 << 6)
> > > -#define DC_CDBGMOD_ACK (1 << 6)
> > > -#define DC_CDBGMOD_ACK_1NAK (2 << 6)
> > > -#define DC_DDBGMODIN_ACK_NAK (0 << 4)
> > > -#define DC_DDBGMODIN_ACK (1 << 4)
> > > -#define DC_DDBGMODIN_ACK_1NAK (2 << 4)
> > > -#define DC_DDBGMODOUT_ACK_NYET_NAK (0 << 2)
> > > -#define DC_DDBGMODOUT_ACK_NYET (1 << 2)
> > > -#define DC_DDBGMODOUT_ACK_NYET_1NAK (2 << 2)
> > > -#define DC_INTLVL (1 << 1)
> > > -#define DC_INTPOL (1 << 0)
> > > -
> > > -#define DC_DEBUG 0x0212
> > > -#define DC_INTENABLE 0x0214
> > > #define DC_IEPTX(n) (1 << (11 + 2 * (n)))
> > > #define DC_IEPRX(n) (1 << (10 + 2 * (n)))
> > > #define DC_IEPRXTX(n) (3 << (10 + 2 * (n)))
> > > -#define DC_IEP0SETUP (1 << 8)
> > > -#define DC_IEVBUS (1 << 7)
> > > -#define DC_IEDMA (1 << 6)
> > > -#define DC_IEHS_STA (1 << 5)
> > > -#define DC_IERESM (1 << 4)
> > > -#define DC_IESUSP (1 << 3)
> > > -#define DC_IEPSOF (1 << 2)
> > > -#define DC_IESOF (1 << 1)
> > > -#define DC_IEBRST (1 << 0)
> > > +
> > > +#define ISP176x_DC_ENDPTYP_ISOC 0x01
> > > +#define ISP176x_DC_ENDPTYP_BULK 0x02
> > > +#define ISP176x_DC_ENDPTYP_INTERRUPT 0x03
> > > +
> > > +/* Initialization Registers */
> > > +#define ISP176x_DC_ADDRESS 0x0200
> > > +#define ISP176x_DC_MODE 0x020c
> > > +#define ISP176x_DC_INTCONF 0x0210
> > > +#define ISP176x_DC_DEBUG 0x0212
> > > +#define ISP176x_DC_INTENABLE 0x0214
> > >
> > > /* Data Flow Registers */
> > > -#define DC_EPINDEX 0x022c
> > > -#define DC_EP0SETUP (1 << 5)
> > > -#define DC_ENDPIDX(n) ((n) << 1)
> > > -#define DC_EPDIR (1 << 0)
> > > -
> > > -#define DC_CTRLFUNC 0x0228
> > > -#define DC_CLBUF (1 << 4)
> > > -#define DC_VENDP (1 << 3)
> > > -#define DC_DSEN (1 << 2)
> > > -#define DC_STATUS (1 << 1)
> > > -#define DC_STALL (1 << 0)
> > > -
> > > -#define DC_DATAPORT 0x0220
> > > -#define DC_BUFLEN 0x021c
> > > -#define DC_DATACOUNT_MASK 0xffff
> > > -#define DC_BUFSTAT 0x021e
> > > -#define DC_EPMAXPKTSZ 0x0204
> > > -
> > > -#define DC_EPTYPE 0x0208
> > > -#define DC_NOEMPKT (1 << 4)
> > > -#define DC_EPENABLE (1 << 3)
> > > -#define DC_DBLBUF (1 << 2)
> > > -#define DC_ENDPTYP_ISOC (1 << 0)
> > > -#define DC_ENDPTYP_BULK (2 << 0)
> > > -#define DC_ENDPTYP_INTERRUPT (3 << 0)
> > > +#define ISP176x_DC_EPMAXPKTSZ 0x0204
> > > +#define ISP176x_DC_EPTYPE 0x0208
> > > +
> > > +#define ISP176x_DC_BUFLEN 0x021c
> > > +#define ISP176x_DC_BUFSTAT 0x021e
> > > +#define ISP176x_DC_DATAPORT 0x0220
> > > +
> > > +#define ISP176x_DC_CTRLFUNC 0x0228
> > > +#define ISP176x_DC_EPINDEX 0x022c
> > > +
> > > +#define ISP1761_DC_OTG_CTRL_SET 0x374
> > > +#define ISP1761_DC_OTG_CTRL_CLEAR 0x376
> > >
> > > /* DMA Registers */
> > > -#define DC_DMACMD 0x0230
> > > -#define DC_DMATXCOUNT 0x0234
> > > -#define DC_DMACONF 0x0238
> > > -#define DC_DMAHW 0x023c
> > > -#define DC_DMAINTREASON 0x0250
> > > -#define DC_DMAINTEN 0x0254
> > > -#define DC_DMAEP 0x0258
> > > -#define DC_DMABURSTCOUNT 0x0264
> > > +#define ISP176x_DC_DMACMD 0x0230
> > > +#define ISP176x_DC_DMATXCOUNT 0x0234
> > > +#define ISP176x_DC_DMACONF 0x0238
> > > +#define ISP176x_DC_DMAHW 0x023c
> > > +#define ISP176x_DC_DMAINTREASON 0x0250
> > > +#define ISP176x_DC_DMAINTEN 0x0254
> > > +#define ISP176x_DC_DMAEP 0x0258
> > > +#define ISP176x_DC_DMABURSTCOUNT 0x0264
> > >
> > > /* General Registers */
> > > -#define DC_INTERRUPT 0x0218
> > > -#define DC_CHIPID 0x0270
> > > -#define DC_FRAMENUM 0x0274
> > > -#define DC_SCRATCH 0x0278
> > > -#define DC_UNLOCKDEV 0x027c
> > > -#define DC_INTPULSEWIDTH 0x0280
> > > -#define DC_TESTMODE 0x0284
> > > +#define ISP176x_DC_INTERRUPT 0x0218
> > > +#define ISP176x_DC_CHIPID 0x0270
> > > +#define ISP176x_DC_FRAMENUM 0x0274
> > > +#define ISP176x_DC_SCRATCH 0x0278
> > > +#define ISP176x_DC_UNLOCKDEV 0x027c
> > > +#define ISP176x_DC_INTPULSEWIDTH 0x0280
> > > +#define ISP176x_DC_TESTMODE 0x0284
> > > +
> > > +static const struct regmap_range isp176x_dc_volatile_ranges[] = {
> > > + regmap_reg_range(ISP176x_DC_EPMAXPKTSZ, ISP176x_DC_EPTYPE),
> > > + regmap_reg_range(ISP176x_DC_BUFLEN, ISP176x_DC_EPINDEX),
> > > + regmap_reg_range(ISP1761_DC_OTG_CTRL_SET, ISP1761_DC_OTG_CTRL_CLEAR),
> > > +};
> > > +
> > > +static const struct regmap_access_table isp176x_dc_volatile_table = {
> > > + .yes_ranges = isp176x_dc_volatile_ranges,
> > > + .n_yes_ranges = ARRAY_SIZE(isp176x_dc_volatile_ranges),
> > > +};
> > > +
> > > +enum isp176x_device_controller_fields {
> > > + /* DC_ADDRESS */
> > > + DC_DEVEN, DC_DEVADDR,
> > > + /* DC_MODE */
> > > + DC_VBUSSTAT, DC_SFRESET, DC_GLINTENA,
> > > + /* DC_INTCONF */
> > > + DC_CDBGMOD_ACK, DC_DDBGMODIN_ACK, DC_DDBGMODOUT_ACK, DC_INTPOL,
> > > + /* DC_INTENABLE */
> > > + DC_IEPRXTX_7, DC_IEPRXTX_6, DC_IEPRXTX_5, DC_IEPRXTX_4, DC_IEPRXTX_3,
> > > + DC_IEPRXTX_2, DC_IEPRXTX_1, DC_IEPRXTX_0,
> > > + DC_IEP0SETUP, DC_IEVBUS, DC_IEHS_STA, DC_IERESM, DC_IESUSP, DC_IEBRST,
> > > + /* DC_EPINDEX */
> > > + DC_EP0SETUP, DC_ENDPIDX, DC_EPDIR,
> > > + /* DC_CTRLFUNC */
> > > + DC_CLBUF, DC_VENDP, DC_DSEN, DC_STATUS, DC_STALL,
> > > + /* DC_BUFLEN */
> > > + DC_BUFLEN,
> > > + /* DC_EPMAXPKTSZ */
> > > + DC_FFOSZ,
> > > + /* DC_EPTYPE */
> > > + DC_EPENABLE, DC_ENDPTYP,
> > > + /* DC_FRAMENUM */
> > > + DC_FRAMENUM, DC_UFRAMENUM,
> > > + /* HW_OTG_CTRL_SET */
> > > + HW_OTG_DISABLE, HW_SW_SEL_HC_DC, HW_VBUS_DRV, HW_SEL_CP_EXT,
> > > + HW_DM_PULLDOWN, HW_DP_PULLDOWN, HW_DP_PULLUP,
> > > + /* HW_OTG_CTRL_CLR */
> > > + HW_OTG_DISABLE_CLEAR, HW_SW_SEL_HC_DC_CLEAR, HW_VBUS_DRV_CLEAR,
> > > + HW_SEL_CP_EXT_CLEAR, HW_DM_PULLDOWN_CLEAR, HW_DP_PULLDOWN_CLEAR,
> > > + HW_DP_PULLUP_CLEAR,
> > > + /* Last element */
> > > + DC_FIELD_MAX,
> > > +};
> > > +
> > > +static const struct reg_field isp1761_dc_reg_fields[] = {
> > > + [DC_DEVEN] = REG_FIELD(ISP176x_DC_ADDRESS, 7, 7),
> > > + [DC_DEVADDR] = REG_FIELD(ISP176x_DC_ADDRESS, 0, 6),
> > > + [DC_VBUSSTAT] = REG_FIELD(ISP176x_DC_MODE, 8, 8),
> > > + [DC_SFRESET] = REG_FIELD(ISP176x_DC_MODE, 4, 4),
> > > + [DC_GLINTENA] = REG_FIELD(ISP176x_DC_MODE, 3, 3),
> > > + [DC_CDBGMOD_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 6, 6),
> > > + [DC_DDBGMODIN_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 4, 4),
> > > + [DC_DDBGMODOUT_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 2, 2),
> > > + [DC_INTPOL] = REG_FIELD(ISP176x_DC_INTCONF, 0, 0),
> > > + [DC_IEPRXTX_7] = REG_FIELD(ISP176x_DC_INTENABLE, 25, 25),
> > > + [DC_IEPRXTX_6] = REG_FIELD(ISP176x_DC_INTENABLE, 23, 23),
> > > + [DC_IEPRXTX_5] = REG_FIELD(ISP176x_DC_INTENABLE, 21, 21),
> > > + [DC_IEPRXTX_4] = REG_FIELD(ISP176x_DC_INTENABLE, 19, 19),
> > > + [DC_IEPRXTX_3] = REG_FIELD(ISP176x_DC_INTENABLE, 17, 17),
> > > + [DC_IEPRXTX_2] = REG_FIELD(ISP176x_DC_INTENABLE, 15, 15),
> > > + [DC_IEPRXTX_1] = REG_FIELD(ISP176x_DC_INTENABLE, 13, 13),
> > > + [DC_IEPRXTX_0] = REG_FIELD(ISP176x_DC_INTENABLE, 11, 11),
> > > + [DC_IEP0SETUP] = REG_FIELD(ISP176x_DC_INTENABLE, 8, 8),
> > > + [DC_IEVBUS] = REG_FIELD(ISP176x_DC_INTENABLE, 7, 7),
> > > + [DC_IEHS_STA] = REG_FIELD(ISP176x_DC_INTENABLE, 5, 5),
> > > + [DC_IERESM] = REG_FIELD(ISP176x_DC_INTENABLE, 4, 4),
> > > + [DC_IESUSP] = REG_FIELD(ISP176x_DC_INTENABLE, 3, 3),
> > > + [DC_IEBRST] = REG_FIELD(ISP176x_DC_INTENABLE, 0, 0),
> > > + [DC_EP0SETUP] = REG_FIELD(ISP176x_DC_EPINDEX, 5, 5),
> > > + [DC_ENDPIDX] = REG_FIELD(ISP176x_DC_EPINDEX, 1, 4),
> > > + [DC_EPDIR] = REG_FIELD(ISP176x_DC_EPINDEX, 0, 0),
> > > + [DC_CLBUF] = REG_FIELD(ISP176x_DC_CTRLFUNC, 4, 4),
> > > + [DC_VENDP] = REG_FIELD(ISP176x_DC_CTRLFUNC, 3, 3),
> > > + [DC_DSEN] = REG_FIELD(ISP176x_DC_CTRLFUNC, 2, 2),
> > > + [DC_STATUS] = REG_FIELD(ISP176x_DC_CTRLFUNC, 1, 1),
> > > + [DC_STALL] = REG_FIELD(ISP176x_DC_CTRLFUNC, 0, 0),
> > > + [DC_BUFLEN] = REG_FIELD(ISP176x_DC_BUFLEN, 0, 15),
> > > + [DC_FFOSZ] = REG_FIELD(ISP176x_DC_EPMAXPKTSZ, 0, 10),
> > > + [DC_EPENABLE] = REG_FIELD(ISP176x_DC_EPTYPE, 3, 3),
> > > + [DC_ENDPTYP] = REG_FIELD(ISP176x_DC_EPTYPE, 0, 1),
> > > + [DC_UFRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 11, 13),
> > > + [DC_FRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 0, 10),
> > > + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 10, 10),
> > > + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 7, 7),
> > > + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 4, 4),
> > > + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 3, 3),
> > > + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 2, 2),
> > > + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 1, 1),
> > > + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 0, 0),
> > > + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 10, 10),
> > > + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 7, 7),
> > > + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 4, 4),
> > > + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 3, 3),
> > > + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 2, 2),
> > > + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 1, 1),
> > > + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 0, 0),
> > > +};
> > >
> > > #endif
> > > diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
> > > index 1714b2258b54..1ce21ef291b6 100644
> > > --- a/drivers/usb/isp1760/isp1760-udc.c
> > > +++ b/drivers/usb/isp1760/isp1760-udc.c
> > > @@ -45,16 +45,62 @@ static inline struct isp1760_request *req_to_udc_req(struct usb_request *req)
> > > return container_of(req, struct isp1760_request, req);
> > > }
> > >
> > > -static inline u32 isp1760_udc_read(struct isp1760_udc *udc, u16 reg)
> > > +static u32 isp1760_udc_read(struct isp1760_udc *udc, u16 field)
> > > {
> > > - return isp1760_read32(udc->regs, reg);
> > > + return isp1760_field_read(udc->fields, field);
> > > }
> > >
> > > -static inline void isp1760_udc_write(struct isp1760_udc *udc, u16 reg, u32 val)
> > > +static void isp1760_udc_write(struct isp1760_udc *udc, u16 field, u32 val)
> > > {
> > > - isp1760_write32(udc->regs, reg, val);
> > > + isp1760_field_write(udc->fields, field, val);
> > > }
> > >
> > > +static u32 isp1760_udc_read_raw(struct isp1760_udc *udc, u16 reg)
> > > +{
> > > + u32 val;
> > > +
> > > + regmap_raw_read(udc->regs, reg, &val, 4);
> > > +
> > > + return le32_to_cpu(val);
> > > +}
> > > +
> > > +static u16 isp1760_udc_read_raw16(struct isp1760_udc *udc, u16 reg)
> > > +{
> > > + u16 val;
> > > +
> > > + regmap_raw_read(udc->regs, reg, &val, 2);
> > > +
> > > + return le16_to_cpu(val);
> > > +}
> > > +
> > > +static void isp1760_udc_write_raw(struct isp1760_udc *udc, u16 reg, u32 val)
> > > +{
> > > + val = cpu_to_le32(val);
> > > +
> > > + regmap_raw_write(udc->regs, reg, &val, 4);
> > > +}
> > > +
> > > +static void isp1760_udc_write_raw16(struct isp1760_udc *udc, u16 reg, u16 val)
> > > +{
> > > + val = cpu_to_le16(val);
> > > +
> > > + regmap_raw_write(udc->regs, reg, &val, 2);
> > > +}
> > > +
> > > +static void isp1760_udc_set(struct isp1760_udc *udc, u32 field)
> > > +{
> > > + isp1760_udc_write(udc, field, 0xFFFFFFFF);
> > > +}
> > > +
> > > +static void isp1760_udc_clear(struct isp1760_udc *udc, u32 field)
> > > +{
> > > + isp1760_udc_write(udc, field, 0);
> > > +}
> > > +
> > > +static bool isp1760_udc_is_set(struct isp1760_udc *udc, u32 field)
> > > +{
> > > + return !!isp1760_udc_read(udc, field);
> > > +}
> > > /* -----------------------------------------------------------------------------
> > > * Endpoint Management
> > > */
> > > @@ -75,11 +121,15 @@ static struct isp1760_ep *isp1760_udc_find_ep(struct isp1760_udc *udc,
> > > return NULL;
> > > }
> > >
> > > -static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> > > +static void __isp1760_udc_select_ep(struct isp1760_udc *udc,
> > > + struct isp1760_ep *ep, int dir)
> > > {
> > > - isp1760_udc_write(ep->udc, DC_EPINDEX,
> > > - DC_ENDPIDX(ep->addr & USB_ENDPOINT_NUMBER_MASK) |
> > > - (dir == USB_DIR_IN ? DC_EPDIR : 0));
> > > + isp1760_udc_write(udc, DC_ENDPIDX, ep->addr & USB_ENDPOINT_NUMBER_MASK);
> > > +
> > > + if (dir == USB_DIR_IN)
> > > + isp1760_udc_set(udc, DC_EPDIR);
> > > + else
> > > + isp1760_udc_clear(udc, DC_EPDIR);
> > > }
> > >
> > > /**
> > > @@ -93,9 +143,10 @@ static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> > > *
> > > * Called with the UDC spinlock held.
> > > */
> > > -static void isp1760_udc_select_ep(struct isp1760_ep *ep)
> > > +static void isp1760_udc_select_ep(struct isp1760_udc *udc,
> > > + struct isp1760_ep *ep)
> > > {
> > > - __isp1760_udc_select_ep(ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> > > + __isp1760_udc_select_ep(udc, ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> > > }
> > >
> > > /* Called with the UDC spinlock held. */
> > > @@ -108,9 +159,13 @@ static void isp1760_udc_ctrl_send_status(struct isp1760_ep *ep, int dir)
> > > * the direction opposite to the data stage data packets, we thus need
> > > * to select the OUT/IN endpoint for IN/OUT transfers.
> > > */
> > > - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) |
> > > - (dir == USB_DIR_IN ? 0 : DC_EPDIR));
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STATUS);
> > > + if (dir == USB_DIR_IN)
> > > + isp1760_udc_clear(udc, DC_EPDIR);
> > > + else
> > > + isp1760_udc_set(udc, DC_EPDIR);
> > > +
> > > + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> > > + isp1760_udc_set(udc, DC_STATUS);
> > >
> > > /*
> > > * The hardware will terminate the request automatically and go back to
> > > @@ -157,10 +212,10 @@ static void isp1760_udc_ctrl_send_stall(struct isp1760_ep *ep)
> > > spin_lock_irqsave(&udc->lock, flags);
> > >
> > > /* Stall both the IN and OUT endpoints. */
> > > - __isp1760_udc_select_ep(ep, USB_DIR_OUT);
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> > > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_OUT);
> > > + isp1760_udc_set(udc, DC_STALL);
> > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > > + isp1760_udc_set(udc, DC_STALL);
> > >
> > > /* A protocol stall completes the control transaction. */
> > > udc->ep0_state = ISP1760_CTRL_SETUP;
> > > @@ -181,8 +236,8 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > > u32 *buf;
> > > int i;
> > >
> > > - isp1760_udc_select_ep(ep);
> > > - len = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> > > + isp1760_udc_select_ep(udc, ep);
> > > + len = isp1760_udc_read(udc, DC_BUFLEN);
> > >
> > > dev_dbg(udc->isp->dev, "%s: received %u bytes (%u/%u done)\n",
> > > __func__, len, req->req.actual, req->req.length);
> > > @@ -198,7 +253,7 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > > * datasheet doesn't clearly document how this should be
> > > * handled.
> > > */
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > > + isp1760_udc_set(udc, DC_CLBUF);
> > > return false;
> > > }
> > >
> > > @@ -209,9 +264,9 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > > * the next packet might be removed from the FIFO.
> > > */
> > > for (i = len; i > 2; i -= 4, ++buf)
> > > - *buf = le32_to_cpu(isp1760_udc_read(udc, DC_DATAPORT));
> > > + *buf = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > > if (i > 0)
> > > - *(u16 *)buf = le16_to_cpu(readw(udc->regs + DC_DATAPORT));
> > > + *(u16 *)buf = isp1760_udc_read_raw16(udc, ISP176x_DC_DATAPORT);
> > >
> > > req->req.actual += len;
> > >
> > > @@ -253,7 +308,7 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> > > __func__, req->packet_size, req->req.actual,
> > > req->req.length);
> > >
> > > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > >
> > > if (req->packet_size)
> > > isp1760_udc_write(udc, DC_BUFLEN, req->packet_size);
> > > @@ -265,14 +320,14 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> > > * the FIFO for this kind of conditions, but doesn't seem to work.
> > > */
> > > for (i = req->packet_size; i > 2; i -= 4, ++buf)
> > > - isp1760_udc_write(udc, DC_DATAPORT, cpu_to_le32(*buf));
> > > + isp1760_udc_write_raw(udc, ISP176x_DC_DATAPORT, *buf);
> > > if (i > 0)
> > > - writew(cpu_to_le16(*(u16 *)buf), udc->regs + DC_DATAPORT);
> > > + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, *(u16 *)buf);
> > >
> > > if (ep->addr == 0)
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > > + isp1760_udc_set(udc, DC_DSEN);
> > > if (!req->packet_size)
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_VENDP);
> > > + isp1760_udc_set(udc, DC_VENDP);
> > > }
> > >
> > > static void isp1760_ep_rx_ready(struct isp1760_ep *ep)
> > > @@ -408,19 +463,24 @@ static int __isp1760_udc_set_halt(struct isp1760_ep *ep, bool halt)
> > > return -EINVAL;
> > > }
> > >
> > > - isp1760_udc_select_ep(ep);
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> > > + isp1760_udc_select_ep(udc, ep);
> > > +
> > > + if (halt)
> > > + isp1760_udc_set(udc, DC_STALL);
> > > + else
> > > + isp1760_udc_clear(udc, DC_STALL);
> > >
> > > if (ep->addr == 0) {
> > > /* When halting the control endpoint, stall both IN and OUT. */
> > > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > > + if (halt)
> > > + isp1760_udc_set(udc, DC_STALL);
> > > + else
> > > + isp1760_udc_clear(udc, DC_STALL);
> > > } else if (!halt) {
> > > /* Reset the data PID by cycling the endpoint enable bit. */
> > > - u16 eptype = isp1760_udc_read(udc, DC_EPTYPE);
> > > -
> > > - isp1760_udc_write(udc, DC_EPTYPE, eptype & ~DC_EPENABLE);
> > > - isp1760_udc_write(udc, DC_EPTYPE, eptype);
> > > + isp1760_udc_clear(udc, DC_EPENABLE);
> > > + isp1760_udc_set(udc, DC_EPENABLE);
> > >
> > > /*
> > > * Disabling the endpoint emptied the transmit FIFO, fill it
> > > @@ -479,12 +539,14 @@ static int isp1760_udc_get_status(struct isp1760_udc *udc,
> > > return -EINVAL;
> > > }
> > >
> > > - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) | DC_EPDIR);
> > > + isp1760_udc_set(udc, DC_EPDIR);
> > > + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> > > +
> > > isp1760_udc_write(udc, DC_BUFLEN, 2);
> > >
> > > - writew(cpu_to_le16(status), udc->regs + DC_DATAPORT);
> > > + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, status);
> > >
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > > + isp1760_udc_set(udc, DC_DSEN);
> > >
> > > dev_dbg(udc->isp->dev, "%s: status 0x%04x\n", __func__, status);
> > >
> > > @@ -508,7 +570,8 @@ static int isp1760_udc_set_address(struct isp1760_udc *udc, u16 addr)
> > > usb_gadget_set_state(&udc->gadget, addr ? USB_STATE_ADDRESS :
> > > USB_STATE_DEFAULT);
> > >
> > > - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN | addr);
> > > + isp1760_udc_write(udc, DC_DEVADDR, addr);
> > > + isp1760_udc_set(udc, DC_DEVEN);
> > >
> > > spin_lock(&udc->lock);
> > > isp1760_udc_ctrl_send_status(&udc->ep[0], USB_DIR_OUT);
> > > @@ -650,9 +713,9 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
> > >
> > > spin_lock(&udc->lock);
> > >
> > > - isp1760_udc_write(udc, DC_EPINDEX, DC_EP0SETUP);
> > > + isp1760_udc_set(udc, DC_EP0SETUP);
> > >
> > > - count = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> > > + count = isp1760_udc_read(udc, DC_BUFLEN);
> > > if (count != sizeof(req)) {
> > > spin_unlock(&udc->lock);
> > >
> > > @@ -663,8 +726,8 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
> > > return;
> > > }
> > >
> > > - req.data[0] = isp1760_udc_read(udc, DC_DATAPORT);
> > > - req.data[1] = isp1760_udc_read(udc, DC_DATAPORT);
> > > + req.data[0] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > > + req.data[1] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > >
> > > if (udc->ep0_state != ISP1760_CTRL_SETUP) {
> > > spin_unlock(&udc->lock);
> > > @@ -732,13 +795,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
> > >
> > > switch (usb_endpoint_type(desc)) {
> > > case USB_ENDPOINT_XFER_ISOC:
> > > - type = DC_ENDPTYP_ISOC;
> > > + type = ISP176x_DC_ENDPTYP_ISOC;
> > > break;
> > > case USB_ENDPOINT_XFER_BULK:
> > > - type = DC_ENDPTYP_BULK;
> > > + type = ISP176x_DC_ENDPTYP_BULK;
> > > break;
> > > case USB_ENDPOINT_XFER_INT:
> > > - type = DC_ENDPTYP_INTERRUPT;
> > > + type = ISP176x_DC_ENDPTYP_INTERRUPT;
> > > break;
> > > case USB_ENDPOINT_XFER_CONTROL:
> > > default:
> > > @@ -755,10 +818,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
> > > uep->halted = false;
> > > uep->wedged = false;
> > >
> > > - isp1760_udc_select_ep(uep);
> > > - isp1760_udc_write(udc, DC_EPMAXPKTSZ, uep->maxpacket);
> > > + isp1760_udc_select_ep(udc, uep);
> > > +
> > > + isp1760_udc_write(udc, DC_FFOSZ, uep->maxpacket);
> > > isp1760_udc_write(udc, DC_BUFLEN, uep->maxpacket);
> > > - isp1760_udc_write(udc, DC_EPTYPE, DC_EPENABLE | type);
> > > +
> > > + isp1760_udc_write(udc, DC_ENDPTYP, type);
> > > + isp1760_udc_set(udc, DC_EPENABLE);
> > >
> > > spin_unlock_irqrestore(&udc->lock, flags);
> > >
> > > @@ -786,8 +852,9 @@ static int isp1760_ep_disable(struct usb_ep *ep)
> > > uep->desc = NULL;
> > > uep->maxpacket = 0;
> > >
> > > - isp1760_udc_select_ep(uep);
> > > - isp1760_udc_write(udc, DC_EPTYPE, 0);
> > > + isp1760_udc_select_ep(udc, uep);
> > > + isp1760_udc_clear(udc, DC_EPENABLE);
> > > + isp1760_udc_clear(udc, DC_ENDPTYP);
> > >
> > > /* TODO Synchronize with the IRQ handler */
> > >
> > > @@ -864,8 +931,8 @@ static int isp1760_ep_queue(struct usb_ep *ep, struct usb_request *_req,
> > >
> > > case ISP1760_CTRL_DATA_OUT:
> > > list_add_tail(&req->queue, &uep->queue);
> > > - __isp1760_udc_select_ep(uep, USB_DIR_OUT);
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > > + __isp1760_udc_select_ep(udc, uep, USB_DIR_OUT);
> > > + isp1760_udc_set(udc, DC_DSEN);
> > > break;
> > >
> > > case ISP1760_CTRL_STATUS:
> > > @@ -1025,14 +1092,14 @@ static void isp1760_ep_fifo_flush(struct usb_ep *ep)
> > >
> > > spin_lock_irqsave(&udc->lock, flags);
> > >
> > > - isp1760_udc_select_ep(uep);
> > > + isp1760_udc_select_ep(udc, uep);
> > >
> > > /*
> > > * Set the CLBUF bit twice to flush both buffers in case double
> > > * buffering is enabled.
> > > */
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > > + isp1760_udc_set(udc, DC_CLBUF);
> > > + isp1760_udc_set(udc, DC_CLBUF);
> > >
> > > spin_unlock_irqrestore(&udc->lock, flags);
> > > }
> > > @@ -1091,19 +1158,30 @@ static void isp1760_udc_init_hw(struct isp1760_udc *udc)
> > > * ACK tokens only (and NYET for the out pipe). The default
> > > * configuration also generates an interrupt on the first NACK token.
> > > */
> > > - isp1760_udc_write(udc, DC_INTCONF, DC_CDBGMOD_ACK | DC_DDBGMODIN_ACK |
> > > - DC_DDBGMODOUT_ACK_NYET);
> > > -
> > > - isp1760_udc_write(udc, DC_INTENABLE, DC_IEPRXTX(7) | DC_IEPRXTX(6) |
> > > - DC_IEPRXTX(5) | DC_IEPRXTX(4) | DC_IEPRXTX(3) |
> > > - DC_IEPRXTX(2) | DC_IEPRXTX(1) | DC_IEPRXTX(0) |
> > > - DC_IEP0SETUP | DC_IEVBUS | DC_IERESM | DC_IESUSP |
> > > - DC_IEHS_STA | DC_IEBRST);
> > > + isp1760_udc_set(udc, DC_CDBGMOD_ACK);
> > > + isp1760_udc_set(udc, DC_DDBGMODIN_ACK);
> > > + isp1760_udc_set(udc, DC_DDBGMODOUT_ACK);
> > > +
> > > + isp1760_udc_set(udc, DC_IEPRXTX_7);
> > > + isp1760_udc_set(udc, DC_IEPRXTX_6);
> > > + isp1760_udc_set(udc, DC_IEPRXTX_5);
> > > + isp1760_udc_set(udc, DC_IEPRXTX_4);
> > > + isp1760_udc_set(udc, DC_IEPRXTX_3);
> > > + isp1760_udc_set(udc, DC_IEPRXTX_2);
> > > + isp1760_udc_set(udc, DC_IEPRXTX_1);
> > > + isp1760_udc_set(udc, DC_IEPRXTX_0);
> > > +
> > > + isp1760_udc_set(udc, DC_IEP0SETUP);
> > > + isp1760_udc_set(udc, DC_IEVBUS);
> > > + isp1760_udc_set(udc, DC_IERESM);
> > > + isp1760_udc_set(udc, DC_IESUSP);
> > > + isp1760_udc_set(udc, DC_IEHS_STA);
> > > + isp1760_udc_set(udc, DC_IEBRST);
> > >
> > > if (udc->connected)
> > > isp1760_set_pullup(udc->isp, true);
> > >
> > > - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN);
> > > + isp1760_udc_set(udc, DC_DEVEN);
> > > }
> > >
> > > static void isp1760_udc_reset(struct isp1760_udc *udc)
> > > @@ -1152,7 +1230,7 @@ static int isp1760_udc_get_frame(struct usb_gadget *gadget)
> > > {
> > > struct isp1760_udc *udc = gadget_to_udc(gadget);
> > >
> > > - return isp1760_udc_read(udc, DC_FRAMENUM) & ((1 << 11) - 1);
> > > + return isp1760_udc_read(udc, DC_FRAMENUM);
> > > }
> > >
> > > static int isp1760_udc_wakeup(struct usb_gadget *gadget)
> > > @@ -1219,7 +1297,7 @@ static int isp1760_udc_start(struct usb_gadget *gadget,
> > > usb_gadget_set_state(&udc->gadget, USB_STATE_ATTACHED);
> > >
> > > /* DMA isn't supported yet, don't enable the DMA clock. */
> > > - isp1760_udc_write(udc, DC_MODE, DC_GLINTENA);
> > > + isp1760_udc_set(udc, DC_GLINTENA);
> > >
> > > isp1760_udc_init_hw(udc);
> > >
> > > @@ -1238,7 +1316,7 @@ static int isp1760_udc_stop(struct usb_gadget *gadget)
> > >
> > > del_timer_sync(&udc->vbus_timer);
> > >
> > > - isp1760_udc_write(udc, DC_MODE, 0);
> > > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > >
> > > spin_lock_irqsave(&udc->lock, flags);
> > > udc->driver = NULL;
> > > @@ -1266,9 +1344,9 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> > > unsigned int i;
> > > u32 status;
> > >
> > > - status = isp1760_udc_read(udc, DC_INTERRUPT)
> > > - & isp1760_udc_read(udc, DC_INTENABLE);
> > > - isp1760_udc_write(udc, DC_INTERRUPT, status);
> > > + status = isp1760_reg_read(udc->regs, ISP176x_DC_INTERRUPT)
> > > + & isp1760_reg_read(udc->regs, ISP176x_DC_INTENABLE);
> > > + isp1760_reg_write(udc->regs, ISP176x_DC_INTERRUPT, status);
> > >
> > > if (status & DC_IEVBUS) {
> > > dev_dbg(udc->isp->dev, "%s(VBUS)\n", __func__);
> > > @@ -1313,7 +1391,7 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> > > dev_dbg(udc->isp->dev, "%s(SUSP)\n", __func__);
> > >
> > > spin_lock(&udc->lock);
> > > - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> > > + if (!isp1760_udc_is_set(udc, DC_VBUSSTAT))
> > > isp1760_udc_disconnect(udc);
> > > else
> > > isp1760_udc_suspend(udc);
> > > @@ -1335,7 +1413,7 @@ static void isp1760_udc_vbus_poll(struct timer_list *t)
> > >
> > > spin_lock_irqsave(&udc->lock, flags);
> > >
> > > - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> > > + if (!(isp1760_udc_is_set(udc, DC_VBUSSTAT)))
> > > isp1760_udc_disconnect(udc);
> > > else if (udc->gadget.state >= USB_STATE_POWERED)
> > > mod_timer(&udc->vbus_timer,
> > > @@ -1412,9 +1490,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> > > * register, and reading the scratch register value back. The chip ID
> > > * and scratch register contents must match the expected values.
> > > */
> > > - isp1760_udc_write(udc, DC_SCRATCH, 0xbabe);
> > > - chipid = isp1760_udc_read(udc, DC_CHIPID);
> > > - scratch = isp1760_udc_read(udc, DC_SCRATCH);
> > > + isp1760_reg_write(udc->regs, ISP176x_DC_SCRATCH, 0xbabe);
> > > + chipid = isp1760_reg_read(udc->regs, ISP176x_DC_CHIPID);
> > > + scratch = isp1760_reg_read(udc->regs, ISP176x_DC_SCRATCH);
> > >
> > > if (scratch != 0xbabe) {
> > > dev_err(udc->isp->dev,
> > > @@ -1429,9 +1507,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> > > }
> > >
> > > /* Reset the device controller. */
> > > - isp1760_udc_write(udc, DC_MODE, DC_SFRESET);
> > > + isp1760_udc_set(udc, DC_SFRESET);
> > > usleep_range(10000, 11000);
> > > - isp1760_udc_write(udc, DC_MODE, 0);
> > > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > > usleep_range(10000, 11000);
> > >
> > > return 0;
> > > @@ -1445,7 +1523,6 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq,
> > >
> > > udc->irq = -1;
> > > udc->isp = isp;
> > > - udc->regs = isp->regs;
> > >
> > > spin_lock_init(&udc->lock);
> > > timer_setup(&udc->vbus_timer, isp1760_udc_vbus_poll, 0);
> > > diff --git a/drivers/usb/isp1760/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
> > > index d2df650d54e9..a49096c0ac8e 100644
> > > --- a/drivers/usb/isp1760/isp1760-udc.h
> > > +++ b/drivers/usb/isp1760/isp1760-udc.h
> > > @@ -17,6 +17,8 @@
> > > #include <linux/timer.h>
> > > #include <linux/usb/gadget.h>
> > >
> > > +#include "isp1760-regs.h"
> >
> > Is this needed ?
>
> for DC_FIELD_MAX below, right?
>
> Cheers,
> Rui
> >
> > > +
> > > struct isp1760_device;
> > > struct isp1760_udc;
> > >
> > > @@ -48,7 +50,7 @@ struct isp1760_ep {
> > > * struct isp1760_udc - UDC state information
> > > * irq: IRQ number
> > > * irqname: IRQ name (as passed to request_irq)
> > > - * regs: Base address of the UDC registers
> > > + * regs: regmap for UDC registers
> > > * driver: Gadget driver
> > > * gadget: Gadget device
> > > * lock: Protects driver, vbus_timer, ep, ep0_*, DC_EPINDEX register
> > > @@ -59,12 +61,13 @@ struct isp1760_ep {
> > > * connected: Tracks gadget driver bus connection state
> > > */
> > > struct isp1760_udc {
> > > -#ifdef CONFIG_USB_ISP1761_UDC
> > > struct isp1760_device *isp;
> > >
> > > int irq;
> > > char *irqname;
> > > - void __iomem *regs;
> > > +
> > > + struct regmap *regs;
> > > + struct regmap_field *fields[DC_FIELD_MAX];
> > >
> > > struct usb_gadget_driver *driver;
> > > struct usb_gadget gadget;
> > > @@ -81,7 +84,6 @@ struct isp1760_udc {
> > > bool connected;
> > >
> > > unsigned int devstatus;
> > > -#endif
> > > };
> > >
> > > #ifdef CONFIG_USB_ISP1761_UDC
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 1/7] usb: isp1760: move to regmap for register access
2021-05-06 13:45 ` Laurent Pinchart
@ 2021-05-06 14:14 ` Rui Miguel Silva
2021-05-06 14:59 ` Laurent Pinchart
0 siblings, 1 reply; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-06 14:14 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Greg Kroah-Hartman, Sebastian Siewior, Rob Herring, linux-usb,
devicetree
Hi Laurent,
On Thu May 6, 2021 at 2:45 PM WEST, Laurent Pinchart wrote:
> Hi Rui,
>
> On Thu, May 06, 2021 at 02:39:13PM +0100, Rui Miguel Silva wrote:
> > On Thu May 6, 2021 at 1:24 PM WEST, Laurent Pinchart wrote:
> > > On Tue, May 04, 2021 at 11:19:04AM +0100, Rui Miguel Silva wrote:
> > > > Rework access to registers and memory to use regmap framework.
> > > > No change in current feature or way of work is intended with this
> > > > change.
> > > >
> > > > This will allow to reuse this driver with other IP of this family,
> > > > for example isp1763, with little changes and effort.
> > > >
> > > > Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
> > > > ---
> > > > drivers/usb/isp1760/isp1760-core.c | 123 +++++---
> > > > drivers/usb/isp1760/isp1760-core.h | 38 ++-
> > > > drivers/usb/isp1760/isp1760-hcd.c | 436 ++++++++++++++--------------
> > > > drivers/usb/isp1760/isp1760-hcd.h | 18 +-
> > > > drivers/usb/isp1760/isp1760-if.c | 4 +-
> > > > drivers/usb/isp1760/isp1760-regs.h | 442 +++++++++++++++++------------
> > > > drivers/usb/isp1760/isp1760-udc.c | 235 +++++++++------
> > > > drivers/usb/isp1760/isp1760-udc.h | 10 +-
> > > > 8 files changed, 779 insertions(+), 527 deletions(-)
> > > >
> > > > diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
> > > > index fdeb4cf97cc5..f78e637d3b9a 100644
> > > > --- a/drivers/usb/isp1760/isp1760-core.c
> > > > +++ b/drivers/usb/isp1760/isp1760-core.c
> > > > @@ -25,8 +25,8 @@
> > > >
> > > > static void isp1760_init_core(struct isp1760_device *isp)
> > > > {
> > > > - u32 otgctrl;
> > > > - u32 hwmode;
> > > > + struct isp1760_hcd *hcd = &isp->hcd;
> > > > + struct isp1760_udc *udc = &isp->udc;
> > > >
> > > > /* Low-level chip reset */
> > > > if (isp->rst_gpio) {
> > > > @@ -39,24 +39,22 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > > * Reset the host controller, including the CPU interface
> > > > * configuration.
> > > > */
> > > > - isp1760_write32(isp->regs, HC_RESET_REG, SW_RESET_RESET_ALL);
> > > > + isp1760_field_set(hcd->fields, SW_RESET_RESET_ALL);
> > > > msleep(100);
> > > >
> > > > /* Setup HW Mode Control: This assumes a level active-low interrupt */
> > > > - hwmode = HW_DATA_BUS_32BIT;
> > > > -
> > > > if (isp->devflags & ISP1760_FLAG_BUS_WIDTH_16)
> > > > - hwmode &= ~HW_DATA_BUS_32BIT;
> > > > + isp1760_field_clear(hcd->fields, HW_DATA_BUS_WIDTH);
> > > > if (isp->devflags & ISP1760_FLAG_ANALOG_OC)
> > > > - hwmode |= HW_ANA_DIGI_OC;
> > > > + isp1760_field_set(hcd->fields, HW_ANA_DIGI_OC);
> > > > if (isp->devflags & ISP1760_FLAG_DACK_POL_HIGH)
> > > > - hwmode |= HW_DACK_POL_HIGH;
> > > > + isp1760_field_set(hcd->fields, HW_DACK_POL_HIGH);
> > > > if (isp->devflags & ISP1760_FLAG_DREQ_POL_HIGH)
> > > > - hwmode |= HW_DREQ_POL_HIGH;
> > > > + isp1760_field_set(hcd->fields, HW_DREQ_POL_HIGH);
> > > > if (isp->devflags & ISP1760_FLAG_INTR_POL_HIGH)
> > > > - hwmode |= HW_INTR_HIGH_ACT;
> > > > + isp1760_field_set(hcd->fields, HW_INTR_HIGH_ACT);
> > > > if (isp->devflags & ISP1760_FLAG_INTR_EDGE_TRIG)
> > > > - hwmode |= HW_INTR_EDGE_TRIG;
> > > > + isp1760_field_set(hcd->fields, HW_INTR_EDGE_TRIG);
> > >
> > > This makes a difference, as you're now writing the register for every
> > > bit. It can have a performance impact (although that should be small,
> >
> > This is in initialization time, so I am not expecting this to have a
> > major performance impact.
>
> This comment applies to the rest of the driver too, not just this
> location. Sorry for not making that clear.
humm, I will change this one, but I can not really spot any other
sequence similar that is in an fast path in which the
read-modify-write would make impact, all access in ptd and mem
read/write are done with isp1760_reg_{read,write}.
Even in run time I did not found any issues.
------
Cheers,
Rui
>
> > > but still), but also a functional impact. I'd rather keep a single write
> > > for this kind of sequence, especially when no read-modify-write sequence
> > > is needed. If you need read-modify-write for the platform you work on,
> > > switching to such patterns should be done in a patch of its own.
> >
> > For me that's ok, I do not have strong feelings about this. I can
> > change it for isp1760_reg_write at the end.
>
> Thanks.
>
> > > >
> > > > /*
> > > > * The ISP1761 has a dedicated DC IRQ line but supports sharing the HC
> > > > @@ -65,18 +63,10 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > > * spurious interrupts during HCD registration.
> > > > */
> > > > if (isp->devflags & ISP1760_FLAG_ISP1761) {
> > > > - isp1760_write32(isp->regs, DC_MODE, 0);
> > > > - hwmode |= HW_COMN_IRQ;
> > > > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > > > + isp1760_field_set(hcd->fields, HW_COMN_IRQ);
> > > > }
> > > >
> > > > - /*
> > > > - * We have to set this first in case we're in 16-bit mode.
> > > > - * Write it twice to ensure correct upper bits if switching
> > > > - * to 16-bit mode.
> > > > - */
> > > > - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> > > > - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> > > > -
> > > > /*
> > > > * PORT 1 Control register of the ISP1760 is the OTG control register
> > > > * on ISP1761.
> > > > @@ -85,14 +75,15 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > > * when OTG is requested.
> > > > */
> > > > if ((isp->devflags & ISP1760_FLAG_ISP1761) &&
> > > > - (isp->devflags & ISP1760_FLAG_OTG_EN))
> > > > - otgctrl = ((HW_DM_PULLDOWN | HW_DP_PULLDOWN) << 16)
> > > > - | HW_OTG_DISABLE;
> > > > - else
> > > > - otgctrl = (HW_SW_SEL_HC_DC << 16)
> > > > - | (HW_VBUS_DRV | HW_SEL_CP_EXT);
> > > > -
> > > > - isp1760_write32(isp->regs, HC_PORT1_CTRL, otgctrl);
> > > > + (isp->devflags & ISP1760_FLAG_OTG_EN)) {
> > > > + isp1760_field_set(hcd->fields, HW_DM_PULLDOWN);
> > > > + isp1760_field_set(hcd->fields, HW_DP_PULLDOWN);
> > > > + isp1760_field_set(hcd->fields, HW_OTG_DISABLE);
> > > > + } else {
> > > > + isp1760_field_set(hcd->fields, HW_SW_SEL_HC_DC);
> > > > + isp1760_field_set(hcd->fields, HW_VBUS_DRV);
> > > > + isp1760_field_set(hcd->fields, HW_SEL_CP_EXT);
> > > > + }
> > > >
> > > > dev_info(isp->dev, "bus width: %u, oc: %s\n",
> > > > isp->devflags & ISP1760_FLAG_BUS_WIDTH_16 ? 16 : 32,
> > > > @@ -101,16 +92,43 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > >
> > > > void isp1760_set_pullup(struct isp1760_device *isp, bool enable)
> > > > {
> > > > - isp1760_write32(isp->regs, HW_OTG_CTRL_SET,
> > > > - enable ? HW_DP_PULLUP : HW_DP_PULLUP << 16);
> > > > + struct isp1760_udc *udc = &isp->udc;
> > > > +
> > > > + if (enable)
> > > > + isp1760_field_set(udc->fields, HW_DP_PULLUP);
> > > > + else
> > > > + isp1760_field_set(udc->fields, HW_DP_PULLUP_CLEAR);
> > > > }
> > > >
> > > > +static struct regmap_config isp1760_hc_regmap_conf = {
> > > > + .name = "isp1760-hc",
> > > > + .reg_bits = 16,
> > > > + .val_bits = 32,
> > > > + .fast_io = true,
> > > > + .max_register = ISP176x_HC_MEMORY,
> > > > + .volatile_table = &isp176x_hc_volatile_table,
> > > > +};
> > > > +
> > > > +static struct regmap_config isp1761_dc_regmap_conf = {
> > > > + .name = "isp1761-dc",
> > > > + .reg_bits = 16,
> > > > + .val_bits = 32,
> > > > + .fast_io = true,
> > > > + .max_register = ISP1761_DC_OTG_CTRL_CLEAR,
> > > > + .volatile_table = &isp176x_dc_volatile_table,
> > > > +};
> > > > +
> > > > int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > > > struct device *dev, unsigned int devflags)
> > > > {
> > > > struct isp1760_device *isp;
> > > > + struct isp1760_hcd *hcd;
> > > > + struct isp1760_udc *udc;
> > > > bool udc_disabled = !(devflags & ISP1760_FLAG_ISP1761);
> > > > + struct regmap_field *f;
> > > > + void __iomem *base;
> > > > int ret;
> > > > + int i;
> > > >
> > > > /*
> > > > * If neither the HCD not the UDC is enabled return an error, as no
> > > > @@ -126,19 +144,52 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > > >
> > > > isp->dev = dev;
> > > > isp->devflags = devflags;
> > > > + hcd = &isp->hcd;
> > > > + udc = &isp->udc;
> > > > +
> > > > + if (devflags & ISP1760_FLAG_BUS_WIDTH_16) {
> > > > + isp1760_hc_regmap_conf.val_bits = 16;
> > > > + isp1761_dc_regmap_conf.val_bits = 16;
> > > > + }
> > > >
> > > > isp->rst_gpio = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);
> > > > if (IS_ERR(isp->rst_gpio))
> > > > return PTR_ERR(isp->rst_gpio);
> > > >
> > > > - isp->regs = devm_ioremap_resource(dev, mem);
> > > > - if (IS_ERR(isp->regs))
> > > > - return PTR_ERR(isp->regs);
> > > > + hcd->base = devm_ioremap_resource(dev, mem);
> > > > + if (IS_ERR(hcd->base))
> > > > + return PTR_ERR(hcd->base);
> > > > +
> > > > + hcd->regs = devm_regmap_init_mmio(dev, base, &isp1760_hc_regmap_conf);
> > > > + if (IS_ERR(hcd->regs))
> > > > + return PTR_ERR(hcd->regs);
> > > > +
> > > > + for (i = 0; i < HC_FIELD_MAX; i++) {
> > > > + f = devm_regmap_field_alloc(dev, hcd->regs,
> > > > + isp1760_hc_reg_fields[i]);
> > > > + if (IS_ERR(f))
> > > > + return PTR_ERR(f);
> > > > +
> > > > + hcd->fields[i] = f;
> > > > + }
> > > > +
> > > > + udc->regs = devm_regmap_init_mmio(dev, base, &isp1761_dc_regmap_conf);
> > > > + if (IS_ERR(udc->regs))
> > > > + return PTR_ERR(udc->regs);
> > > > +
> > > > + for (i = 0; i < DC_FIELD_MAX; i++) {
> > > > + f = devm_regmap_field_alloc(dev, udc->regs,
> > > > + isp1761_dc_reg_fields[i]);
> > > > + if (IS_ERR(f))
> > > > + return PTR_ERR(f);
> > > > +
> > > > + udc->fields[i] = f;
> > > > + }
> > > >
> > > > isp1760_init_core(isp);
> > > >
> > > > if (IS_ENABLED(CONFIG_USB_ISP1760_HCD) && !usb_disabled()) {
> > > > - ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq,
> > > > + ret = isp1760_hcd_register(hcd, mem, irq,
> > > > irqflags | IRQF_SHARED, dev);
> > > > if (ret < 0)
> > > > return ret;
> > > > @@ -147,7 +198,7 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > > > if (IS_ENABLED(CONFIG_USB_ISP1761_UDC) && !udc_disabled) {
> > > > ret = isp1760_udc_register(isp, irq, irqflags);
> > > > if (ret < 0) {
> > > > - isp1760_hcd_unregister(&isp->hcd);
> > > > + isp1760_hcd_unregister(hcd);
> > > > return ret;
> > > > }
> > > > }
> > > > diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
> > > > index d9a0a4cc467c..8fec6395f19f 100644
> > > > --- a/drivers/usb/isp1760/isp1760-core.h
> > > > +++ b/drivers/usb/isp1760/isp1760-core.h
> > > > @@ -14,6 +14,7 @@
> > > > #define _ISP1760_CORE_H_
> > > >
> > > > #include <linux/ioport.h>
> > > > +#include <linux/regmap.h>
> > > >
> > > > #include "isp1760-hcd.h"
> > > > #include "isp1760-udc.h"
> > > > @@ -38,7 +39,6 @@ struct gpio_desc;
> > > > struct isp1760_device {
> > > > struct device *dev;
> > > >
> > > > - void __iomem *regs;
> > > > unsigned int devflags;
> > > > struct gpio_desc *rst_gpio;
> > > >
> > > > @@ -52,14 +52,42 @@ void isp1760_unregister(struct device *dev);
> > > >
> > > > void isp1760_set_pullup(struct isp1760_device *isp, bool enable);
> > > >
> > > > -static inline u32 isp1760_read32(void __iomem *base, u32 reg)
> > > > +static inline u32 isp1760_field_read(struct regmap_field **fields, u32 field)
> > > > {
> > > > - return readl(base + reg);
> > > > + unsigned int val;
> > > > +
> > > > + regmap_field_read(fields[field], &val);
> > > > +
> > > > + return val;
> > > > +}
> > > > +
> > > > +static inline void isp1760_field_write(struct regmap_field **fields, u32 field,
> > > > + u32 val)
> > > > +{
> > > > + regmap_field_write(fields[field], val);
> > > > +}
> > > > +
> > > > +static inline void isp1760_field_set(struct regmap_field **fields, u32 field)
> > > > +{
> > > > + isp1760_field_write(fields, field, 0xFFFFFFFF);
> > > > }
> > > >
> > > > -static inline void isp1760_write32(void __iomem *base, u32 reg, u32 val)
> > > > +static inline void isp1760_field_clear(struct regmap_field **fields, u32 field)
> > > > {
> > > > - writel(val, base + reg);
> > > > + isp1760_field_write(fields, field, 0);
> > > > }
> > > >
> > > > +static inline u32 isp1760_reg_read(struct regmap *regs, u32 reg)
> > > > +{
> > > > + unsigned int val;
> > > > +
> > > > + regmap_read(regs, reg, &val);
> > > > +
> > > > + return val;
> > > > +}
> > > > +
> > > > +static inline void isp1760_reg_write(struct regmap *regs, u32 reg, u32 val)
> > > > +{
> > > > + regmap_write(regs, reg, val);
> > > > +}
> > > > #endif
> > > > diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
> > > > index 33ae656c4b68..0601b1a4bd42 100644
> > > > --- a/drivers/usb/isp1760/isp1760-hcd.c
> > > > +++ b/drivers/usb/isp1760/isp1760-hcd.c
> > > > @@ -66,6 +66,10 @@ struct ptd {
> > > > #define ATL_PTD_OFFSET 0x0c00
> > > > #define PAYLOAD_OFFSET 0x1000
> > > >
> > > > +#define ISP_BANK_0 0x00
> > > > +#define ISP_BANK_1 0x01
> > > > +#define ISP_BANK_2 0x02
> > > > +#define ISP_BANK_3 0x03
> > > >
> > > > /* ATL */
> > > > /* DW0 */
> > > > @@ -159,16 +163,59 @@ struct urb_listitem {
> > > > };
> > > >
> > > > /*
> > > > - * Access functions for isp176x registers (addresses 0..0x03FF).
> > > > + * Access functions for isp176x registers regmap fields
> > > > */
> > > > -static u32 reg_read32(void __iomem *base, u32 reg)
> > > > +static u32 isp1760_hcd_read(struct usb_hcd *hcd, u32 field)
> > > > {
> > > > - return isp1760_read32(base, reg);
> > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > +
> > > > + return isp1760_field_read(priv->fields, field);
> > > > +}
> > > > +
> > > > +static void isp1760_hcd_write(struct usb_hcd *hcd, u32 field, u32 val)
> > > > +{
> > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > +
> > > > + isp1760_field_write(priv->fields, field, val);
> > > > +}
> > > > +
> > > > +static void isp1760_hcd_set(struct usb_hcd *hcd, u32 field)
> > > > +{
> > > > + isp1760_hcd_write(hcd, field, 0xFFFFFFFF);
> > > > +}
> > > > +
> > > > +static void isp1760_hcd_clear(struct usb_hcd *hcd, u32 field)
> > > > +{
> > > > + isp1760_hcd_write(hcd, field, 0);
> > > > +}
> > > > +
> > > > +static int isp1760_hcd_set_poll_timeout(struct usb_hcd *hcd, u32 field,
> > > > + u32 timeout_us)
> > > > +{
> > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > + unsigned int val;
> > > > +
> > > > + isp1760_hcd_set(hcd, field);
> > > > +
> > > > + return regmap_field_read_poll_timeout(priv->fields[field], val, 1, 1,
> > > > + timeout_us);
> > > > }
> > > >
> > > > -static void reg_write32(void __iomem *base, u32 reg, u32 val)
> > > > +static int isp1760_hcd_clear_poll_timeout(struct usb_hcd *hcd, u32 field,
> > > > + u32 timeout_us)
> > > > {
> > > > - isp1760_write32(base, reg, val);
> > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > + unsigned int val;
> > > > +
> > > > + isp1760_hcd_clear(hcd, field);
> > > > +
> > > > + return regmap_field_read_poll_timeout(priv->fields[field], val, 0, 1,
> > > > + timeout_us);
> > > > +}
> > > > +
> > > > +static bool isp1760_hcd_is_set(struct usb_hcd *hcd, u32 field)
> > > > +{
> > > > + return !!isp1760_hcd_read(hcd, field);
> > > > }
> > > >
> > > > /*
> > > > @@ -231,12 +278,15 @@ static void bank_reads8(void __iomem *src_base, u32 src_offset, u32 bank_addr,
> > > > }
> > > > }
> > > >
> > > > -static void mem_reads8(void __iomem *src_base, u32 src_offset, void *dst,
> > > > - u32 bytes)
> > > > +static void mem_reads8(struct usb_hcd *hcd, void __iomem *src_base,
> > > > + u32 src_offset, void *dst, u32 bytes)
> > > > {
> > > > - reg_write32(src_base, HC_MEMORY_REG, src_offset + ISP_BANK(0));
> > > > + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> > > > + isp1760_hcd_write(hcd, MEM_START_ADDR, src_offset);
> > > > +
> > > > ndelay(90);
> > > > - bank_reads8(src_base, src_offset, ISP_BANK(0), dst, bytes);
> > > > +
> > > > + bank_reads8(src_base, src_offset, ISP_BANK_0, dst, bytes);
> > > > }
> > > >
> > > > static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> > > > @@ -278,14 +328,15 @@ static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> > > > * Read and write ptds. 'ptd_offset' should be one of ISO_PTD_OFFSET,
> > > > * INT_PTD_OFFSET, and ATL_PTD_OFFSET. 'slot' should be less than 32.
> > > > */
> > > > -static void ptd_read(void __iomem *base, u32 ptd_offset, u32 slot,
> > > > - struct ptd *ptd)
> > > > +static void ptd_read(struct usb_hcd *hcd, void __iomem *base,
> > > > + u32 ptd_offset, u32 slot, struct ptd *ptd)
> > > > {
> > > > - reg_write32(base, HC_MEMORY_REG,
> > > > - ISP_BANK(0) + ptd_offset + slot*sizeof(*ptd));
> > > > + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> > > > + isp1760_hcd_write(hcd, MEM_START_ADDR,
> > > > + ptd_offset + slot * sizeof(*ptd));
> > > > ndelay(90);
> > > > - bank_reads8(base, ptd_offset + slot*sizeof(*ptd), ISP_BANK(0),
> > > > - (void *) ptd, sizeof(*ptd));
> > > > + bank_reads8(base, ptd_offset + slot * sizeof(*ptd), ISP_BANK_0,
> > > > + (void *)ptd, sizeof(*ptd));
> > > > }
> > > >
> > > > static void ptd_write(void __iomem *base, u32 ptd_offset, u32 slot,
> > > > @@ -377,34 +428,15 @@ static void free_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
> > > > qtd->payload_addr = 0;
> > > > }
> > > >
> > > > -static int handshake(struct usb_hcd *hcd, u32 reg,
> > > > - u32 mask, u32 done, int usec)
> > > > -{
> > > > - u32 result;
> > > > - int ret;
> > > > -
> > > > - ret = readl_poll_timeout_atomic(hcd->regs + reg, result,
> > > > - ((result & mask) == done ||
> > > > - result == U32_MAX), 1, usec);
> > > > - if (result == U32_MAX)
> > > > - return -ENODEV;
> > > > -
> > > > - return ret;
> > > > -}
> > > > -
> > > > /* reset a non-running (STS_HALT == 1) controller */
> > > > static int ehci_reset(struct usb_hcd *hcd)
> > > > {
> > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > >
> > > > - u32 command = reg_read32(hcd->regs, HC_USBCMD);
> > > > -
> > > > - command |= CMD_RESET;
> > > > - reg_write32(hcd->regs, HC_USBCMD, command);
> > > > hcd->state = HC_STATE_HALT;
> > > > priv->next_statechange = jiffies;
> > > >
> > > > - return handshake(hcd, HC_USBCMD, CMD_RESET, 0, 250 * 1000);
> > > > + return isp1760_hcd_set_poll_timeout(hcd, CMD_RESET, 250 * 1000);
> > > > }
> > > >
> > > > static struct isp1760_qh *qh_alloc(gfp_t flags)
> > > > @@ -432,8 +464,10 @@ static void qh_free(struct isp1760_qh *qh)
> > > > /* one-time init, only for memory state */
> > > > static int priv_init(struct usb_hcd *hcd)
> > > > {
> > > > - struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > - u32 hcc_params;
> > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > + u32 isoc_cache;
> > > > + u32 isoc_thres;
> > > > +
> > > > int i;
> > > >
> > > > spin_lock_init(&priv->lock);
> > > > @@ -448,12 +482,14 @@ static int priv_init(struct usb_hcd *hcd)
> > > > priv->periodic_size = DEFAULT_I_TDPS;
> > > >
> > > > /* controllers may cache some of the periodic schedule ... */
> > > > - hcc_params = reg_read32(hcd->regs, HC_HCCPARAMS);
> > > > + isoc_cache = isp1760_hcd_read(hcd->regs, HCC_ISOC_CACHE);
> > > > + isoc_thres = isp1760_hcd_read(hcd->regs, HCC_ISOC_THRES);
> > > > +
> > > > /* full frame cache */
> > > > - if (HCC_ISOC_CACHE(hcc_params))
> > > > + if (isoc_cache)
> > > > priv->i_thresh = 8;
> > > > else /* N microframes cached */
> > > > - priv->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
> > > > + priv->i_thresh = 2 + isoc_thres;
> > > >
> > > > return 0;
> > > > }
> > > > @@ -462,12 +498,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > > > {
> > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > int result;
> > > > - u32 scratch, hwmode;
> > > > + u32 scratch;
> > > > +
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_SCRATCH, 0xdeadbabe);
> > > >
> > > > - reg_write32(hcd->regs, HC_SCRATCH_REG, 0xdeadbabe);
> > > > /* Change bus pattern */
> > > > - scratch = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> > > > - scratch = reg_read32(hcd->regs, HC_SCRATCH_REG);
> > > > + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> > > > + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_SCRATCH);
> > > > if (scratch != 0xdeadbabe) {
> > > > dev_err(hcd->self.controller, "Scratch test failed.\n");
> > > > return -ENODEV;
> > > > @@ -481,10 +518,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > > > * the host controller through the EHCI USB Command register. The device
> > > > * has been reset in core code anyway, so this shouldn't matter.
> > > > */
> > > > - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG, 0);
> > > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > > > - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_BUFFER_STATUS, 0);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > > > + NO_TRANSFER_ACTIVE);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > > > + NO_TRANSFER_ACTIVE);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP,
> > > > + NO_TRANSFER_ACTIVE);
> > > >
> > > > result = ehci_reset(hcd);
> > > > if (result)
> > > > @@ -493,14 +533,11 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > > > /* Step 11 passed */
> > > >
> > > > /* ATL reset */
> > > > - hwmode = reg_read32(hcd->regs, HC_HW_MODE_CTRL) & ~ALL_ATX_RESET;
> > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode | ALL_ATX_RESET);
> > > > + isp1760_hcd_set(hcd, ALL_ATX_RESET);
> > > > mdelay(10);
> > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode);
> > > > -
> > > > - reg_write32(hcd->regs, HC_INTERRUPT_ENABLE, INTERRUPT_ENABLE_MASK);
> > > > + isp1760_hcd_clear(hcd, ALL_ATX_RESET);
> > > >
> > > > - priv->hcs_params = reg_read32(hcd->regs, HC_HCSPARAMS);
> > > > + isp1760_hcd_set(hcd, HC_INT_ENABLE);
> > > >
> > > > return priv_init(hcd);
> > > > }
> > > > @@ -730,12 +767,12 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
> > > >
> > > > /* Make sure done map has not triggered from some unlinked transfer */
> > > > if (ptd_offset == ATL_PTD_OFFSET) {
> > > > - priv->atl_done_map |= reg_read32(hcd->regs,
> > > > - HC_ATL_PTD_DONEMAP_REG);
> > > > + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> > > > + ISP176x_HC_ATL_PTD_DONEMAP);
> > > > priv->atl_done_map &= ~(1 << slot);
> > > > } else {
> > > > - priv->int_done_map |= reg_read32(hcd->regs,
> > > > - HC_INT_PTD_DONEMAP_REG);
> > > > + priv->int_done_map |= isp1760_reg_read(priv->regs,
> > > > + ISP176x_HC_INT_PTD_DONEMAP);
> > > > priv->int_done_map &= ~(1 << slot);
> > > > }
> > > >
> > > > @@ -744,16 +781,20 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
> > > > slots[slot].timestamp = jiffies;
> > > > slots[slot].qtd = qtd;
> > > > slots[slot].qh = qh;
> > > > - ptd_write(hcd->regs, ptd_offset, slot, ptd);
> > > > + ptd_write(priv->base, ptd_offset, slot, ptd);
> > > >
> > > > if (ptd_offset == ATL_PTD_OFFSET) {
> > > > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > > > + skip_map = isp1760_reg_read(priv->regs,
> > > > + ISP176x_HC_ATL_PTD_SKIPMAP);
> > > > skip_map &= ~(1 << qh->slot);
> > > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > > > + skip_map);
> > > > } else {
> > > > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > > > + skip_map = isp1760_reg_read(priv->regs,
> > > > + ISP176x_HC_INT_PTD_SKIPMAP);
> > > > skip_map &= ~(1 << qh->slot);
> > > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > > > + skip_map);
> > > > }
> > > > }
> > > >
> > > > @@ -766,9 +807,10 @@ static int is_short_bulk(struct isp1760_qtd *qtd)
> > > > static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> > > > struct list_head *urb_list)
> > > > {
> > > > - int last_qtd;
> > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > struct isp1760_qtd *qtd, *qtd_next;
> > > > struct urb_listitem *urb_listitem;
> > > > + int last_qtd;
> > > >
> > > > list_for_each_entry_safe(qtd, qtd_next, &qh->qtd_list, qtd_list) {
> > > > if (qtd->status < QTD_XFER_COMPLETE)
> > > > @@ -783,9 +825,10 @@ static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> > > > if (qtd->actual_length) {
> > > > switch (qtd->packet_type) {
> > > > case IN_PID:
> > > > - mem_reads8(hcd->regs, qtd->payload_addr,
> > > > - qtd->data_buffer,
> > > > - qtd->actual_length);
> > > > + mem_reads8(hcd, priv->base,
> > > > + qtd->payload_addr,
> > > > + qtd->data_buffer,
> > > > + qtd->actual_length);
> > > > fallthrough;
> > > > case OUT_PID:
> > > > qtd->urb->actual_length +=
> > > > @@ -873,8 +916,8 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
> > > > if ((qtd->length) &&
> > > > ((qtd->packet_type == SETUP_PID) ||
> > > > (qtd->packet_type == OUT_PID))) {
> > > > - mem_writes8(hcd->regs, qtd->payload_addr,
> > > > - qtd->data_buffer, qtd->length);
> > > > + mem_writes8(priv->base, qtd->payload_addr,
> > > > + qtd->data_buffer, qtd->length);
> > > > }
> > > >
> > > > qtd->status = QTD_PAYLOAD_ALLOC;
> > > > @@ -1074,9 +1117,9 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > > int modified;
> > > > int skip_map;
> > > >
> > > > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > > > + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP);
> > > > priv->int_done_map &= ~skip_map;
> > > > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > > > + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP);
> > > > priv->atl_done_map &= ~skip_map;
> > > >
> > > > modified = priv->int_done_map || priv->atl_done_map;
> > > > @@ -1094,7 +1137,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > > continue;
> > > > }
> > > > ptd_offset = INT_PTD_OFFSET;
> > > > - ptd_read(hcd->regs, INT_PTD_OFFSET, slot, &ptd);
> > > > + ptd_read(hcd, priv->base, INT_PTD_OFFSET, slot, &ptd);
> > > > state = check_int_transfer(hcd, &ptd,
> > > > slots[slot].qtd->urb);
> > > > } else {
> > > > @@ -1109,7 +1152,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > > continue;
> > > > }
> > > > ptd_offset = ATL_PTD_OFFSET;
> > > > - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> > > > + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> > > > state = check_atl_transfer(hcd, &ptd,
> > > > slots[slot].qtd->urb);
> > > > }
> > > > @@ -1134,7 +1177,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > >
> > > > qtd->status = QTD_XFER_COMPLETE;
> > > > if (list_is_last(&qtd->qtd_list, &qh->qtd_list) ||
> > > > - is_short_bulk(qtd))
> > > > + is_short_bulk(qtd))
> > > > qtd = NULL;
> > > > else
> > > > qtd = list_entry(qtd->qtd_list.next,
> > > > @@ -1210,13 +1253,15 @@ static irqreturn_t isp1760_irq(struct usb_hcd *hcd)
> > > > if (!(hcd->state & HC_STATE_RUNNING))
> > > > goto leave;
> > > >
> > > > - imask = reg_read32(hcd->regs, HC_INTERRUPT_REG);
> > > > + imask = isp1760_reg_read(priv->regs, ISP176x_HC_INTERRUPT);
> > > > if (unlikely(!imask))
> > > > goto leave;
> > > > - reg_write32(hcd->regs, HC_INTERRUPT_REG, imask); /* Clear */
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INTERRUPT, imask); /* Clear */
> > > >
> > > > - priv->int_done_map |= reg_read32(hcd->regs, HC_INT_PTD_DONEMAP_REG);
> > > > - priv->atl_done_map |= reg_read32(hcd->regs, HC_ATL_PTD_DONEMAP_REG);
> > > > + priv->int_done_map |= isp1760_reg_read(priv->regs,
> > > > + ISP176x_HC_INT_PTD_DONEMAP);
> > > > + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> > > > + ISP176x_HC_ATL_PTD_DONEMAP);
> > > >
> > > > handle_done_ptds(hcd);
> > > >
> > > > @@ -1271,7 +1316,7 @@ static void errata2_function(struct timer_list *unused)
> > > > if (priv->atl_slots[slot].qh && time_after(jiffies,
> > > > priv->atl_slots[slot].timestamp +
> > > > msecs_to_jiffies(SLOT_TIMEOUT))) {
> > > > - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> > > > + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> > > > if (!FROM_DW0_VALID(ptd.dw0) &&
> > > > !FROM_DW3_ACTIVE(ptd.dw3))
> > > > priv->atl_done_map |= 1 << slot;
> > > > @@ -1288,9 +1333,8 @@ static void errata2_function(struct timer_list *unused)
> > > >
> > > > static int isp1760_run(struct usb_hcd *hcd)
> > > > {
> > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > int retval;
> > > > - u32 temp;
> > > > - u32 command;
> > > > u32 chipid;
> > > >
> > > > hcd->uses_new_polling = 1;
> > > > @@ -1298,23 +1342,20 @@ static int isp1760_run(struct usb_hcd *hcd)
> > > > hcd->state = HC_STATE_RUNNING;
> > > >
> > > > /* Set PTD interrupt AND & OR maps */
> > > > - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_AND_REG, 0);
> > > > - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_OR_REG, 0xffffffff);
> > > > - reg_write32(hcd->regs, HC_INT_IRQ_MASK_AND_REG, 0);
> > > > - reg_write32(hcd->regs, HC_INT_IRQ_MASK_OR_REG, 0xffffffff);
> > > > - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_AND_REG, 0);
> > > > - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_OR_REG, 0xffffffff);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_AND, 0);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_OR, 0xffffffff);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_AND, 0);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_OR, 0xffffffff);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_AND, 0);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_OR, 0xffffffff);
> > > > /* step 23 passed */
> > > >
> > > > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp | HW_GLOBAL_INTR_EN);
> > > > + isp1760_hcd_set(hcd, HW_GLOBAL_INTR_EN);
> > > >
> > > > - command = reg_read32(hcd->regs, HC_USBCMD);
> > > > - command &= ~(CMD_LRESET|CMD_RESET);
> > > > - command |= CMD_RUN;
> > > > - reg_write32(hcd->regs, HC_USBCMD, command);
> > > > + isp1760_hcd_clear(hcd, CMD_LRESET);
> > > > + isp1760_hcd_clear(hcd, CMD_RESET);
> > > >
> > > > - retval = handshake(hcd, HC_USBCMD, CMD_RUN, CMD_RUN, 250 * 1000);
> > > > + retval = isp1760_hcd_set_poll_timeout(hcd, CMD_RUN, 250 * 1000);
> > > > if (retval)
> > > > return retval;
> > > >
> > > > @@ -1324,9 +1365,8 @@ static int isp1760_run(struct usb_hcd *hcd)
> > > > * the semaphore while doing so.
> > > > */
> > > > down_write(&ehci_cf_port_reset_rwsem);
> > > > - reg_write32(hcd->regs, HC_CONFIGFLAG, FLAG_CF);
> > > >
> > > > - retval = handshake(hcd, HC_CONFIGFLAG, FLAG_CF, FLAG_CF, 250 * 1000);
> > > > + retval = isp1760_hcd_set_poll_timeout(hcd, FLAG_CF, 250 * 1000);
> > > > up_write(&ehci_cf_port_reset_rwsem);
> > > > if (retval)
> > > > return retval;
> > > > @@ -1336,21 +1376,22 @@ static int isp1760_run(struct usb_hcd *hcd)
> > > > errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
> > > > add_timer(&errata2_timer);
> > > >
> > > > - chipid = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> > > > + chipid = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> > > > dev_info(hcd->self.controller, "USB ISP %04x HW rev. %d started\n",
> > > > chipid & 0xffff, chipid >> 16);
> > > >
> > > > /* PTD Register Init Part 2, Step 28 */
> > > >
> > > > /* Setup registers controlling PTD checking */
> > > > - reg_write32(hcd->regs, HC_ATL_PTD_LASTPTD_REG, 0x80000000);
> > > > - reg_write32(hcd->regs, HC_INT_PTD_LASTPTD_REG, 0x80000000);
> > > > - reg_write32(hcd->regs, HC_ISO_PTD_LASTPTD_REG, 0x00000001);
> > > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, 0xffffffff);
> > > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, 0xffffffff);
> > > > - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, 0xffffffff);
> > > > - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG,
> > > > - ATL_BUF_FILL | INT_BUF_FILL);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_LASTPTD, 0x80000000);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_LASTPTD, 0x80000000);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_LASTPTD, 0x00000001);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP, 0xffffffff);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP, 0xffffffff);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP, 0xffffffff);
> > > > +
> > > > + isp1760_hcd_set(hcd, ATL_BUF_FILL);
> > > > + isp1760_hcd_set(hcd, INT_BUF_FILL);
> > > >
> > > > /* GRR this is run-once init(), being done every time the HC starts.
> > > > * So long as they're part of class devices, we can't do it init()
> > > > @@ -1584,15 +1625,19 @@ static void kill_transfer(struct usb_hcd *hcd, struct urb *urb,
> > > > /* We need to forcefully reclaim the slot since some transfers never
> > > > return, e.g. interrupt transfers and NAKed bulk transfers. */
> > > > if (usb_pipecontrol(urb->pipe) || usb_pipebulk(urb->pipe)) {
> > > > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > > > + skip_map = isp1760_reg_read(priv->regs,
> > > > + ISP176x_HC_ATL_PTD_SKIPMAP);
> > > > skip_map |= (1 << qh->slot);
> > > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > > > + skip_map);
> > > > priv->atl_slots[qh->slot].qh = NULL;
> > > > priv->atl_slots[qh->slot].qtd = NULL;
> > > > } else {
> > > > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > > > + skip_map = isp1760_reg_read(priv->regs,
> > > > + ISP176x_HC_INT_PTD_SKIPMAP);
> > > > skip_map |= (1 << qh->slot);
> > > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > > > + skip_map);
> > > > priv->int_slots[qh->slot].qh = NULL;
> > > > priv->int_slots[qh->slot].qtd = NULL;
> > > > }
> > > > @@ -1705,8 +1750,7 @@ static void isp1760_endpoint_disable(struct usb_hcd *hcd,
> > > > static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > > {
> > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > - u32 temp, status = 0;
> > > > - u32 mask;
> > > > + u32 status = 0;
> > > > int retval = 1;
> > > > unsigned long flags;
> > > >
> > > > @@ -1716,17 +1760,13 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > >
> > > > /* init status to no-changes */
> > > > buf[0] = 0;
> > > > - mask = PORT_CSC;
> > > >
> > > > spin_lock_irqsave(&priv->lock, flags);
> > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > >
> > > > - if (temp & PORT_OWNER) {
> > > > - if (temp & PORT_CSC) {
> > > > - temp &= ~PORT_CSC;
> > > > - reg_write32(hcd->regs, HC_PORTSC1, temp);
> > > > - goto done;
> > > > - }
> > > > + if (isp1760_hcd_is_set(hcd, PORT_OWNER) &&
> > > > + isp1760_hcd_is_set(hcd, PORT_CSC)) {
> > > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > > + goto done;
> > > > }
> > > >
> > > > /*
> > > > @@ -1735,11 +1775,9 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > > * high-speed device is switched over to the companion
> > > > * controller by the user.
> > > > */
> > > > -
> > > > - if ((temp & mask) != 0
> > > > - || ((temp & PORT_RESUME) != 0
> > > > - && time_after_eq(jiffies,
> > > > - priv->reset_done))) {
> > > > + if (isp1760_hcd_is_set(hcd, PORT_CSC) ||
> > > > + (isp1760_hcd_is_set(hcd, PORT_RESUME) &&
> > > > + time_after_eq(jiffies, priv->reset_done))) {
> > > > buf [0] |= 1 << (0 + 1);
> > > > status = STS_PCD;
> > > > }
> > > > @@ -1752,9 +1790,11 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > > static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > > > struct usb_hub_descriptor *desc)
> > > > {
> > > > - int ports = HCS_N_PORTS(priv->hcs_params);
> > > > + int ports;
> > > > u16 temp;
> > > >
> > > > + ports = isp1760_hcd_read(priv->hcd, HCS_N_PORTS);
> > > > +
> > > > desc->bDescriptorType = USB_DT_HUB;
> > > > /* priv 1.0, 2.3.9 says 20ms max */
> > > > desc->bPwrOn2PwrGood = 10;
> > > > @@ -1770,7 +1810,7 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > > >
> > > > /* per-port overcurrent reporting */
> > > > temp = HUB_CHAR_INDV_PORT_OCPM;
> > > > - if (HCS_PPC(priv->hcs_params))
> > > > + if (isp1760_hcd_is_set(priv->hcd, HCS_PPC))
> > > > /* per-port power control */
> > > > temp |= HUB_CHAR_INDV_PORT_LPSM;
> > > > else
> > > > @@ -1781,38 +1821,37 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > > >
> > > > #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)
> > > >
> > > > -static int check_reset_complete(struct usb_hcd *hcd, int index,
> > > > - int port_status)
> > > > +static void check_reset_complete(struct usb_hcd *hcd, int index)
> > > > {
> > > > - if (!(port_status & PORT_CONNECT))
> > > > - return port_status;
> > > > + if (!(isp1760_hcd_is_set(hcd, PORT_CONNECT)))
> > > > + return;
> > > >
> > > > /* if reset finished and it's still not enabled -- handoff */
> > > > - if (!(port_status & PORT_PE)) {
> > > > -
> > > > + if (!isp1760_hcd_is_set(hcd, PORT_PE)) {
> > > > dev_info(hcd->self.controller,
> > > > "port %d full speed --> companion\n",
> > > > index + 1);
> > > >
> > > > - port_status |= PORT_OWNER;
> > > > - port_status &= ~PORT_RWC_BITS;
> > > > - reg_write32(hcd->regs, HC_PORTSC1, port_status);
> > > > + isp1760_hcd_set(hcd, PORT_OWNER);
> > > >
> > > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > > } else
> > > > dev_info(hcd->self.controller, "port %d high speed\n",
> > > > index + 1);
> > > >
> > > > - return port_status;
> > > > + return;
> > > > }
> > > >
> > > > static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > u16 wValue, u16 wIndex, char *buf, u16 wLength)
> > > > {
> > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > - int ports = HCS_N_PORTS(priv->hcs_params);
> > > > - u32 temp, status;
> > > > + u32 status;
> > > > unsigned long flags;
> > > > int retval = 0;
> > > > + int ports;
> > > > +
> > > > + ports = isp1760_hcd_read(hcd, HCS_N_PORTS);
> > > >
> > > > /*
> > > > * FIXME: support SetPortFeatures USB_PORT_FEAT_INDICATOR.
> > > > @@ -1837,7 +1876,6 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > if (!wIndex || wIndex > ports)
> > > > goto error;
> > > > wIndex--;
> > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > >
> > > > /*
> > > > * Even if OWNER is set, so the port is owned by the
> > > > @@ -1848,22 +1886,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > >
> > > > switch (wValue) {
> > > > case USB_PORT_FEAT_ENABLE:
> > > > - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_PE);
> > > > + isp1760_hcd_clear(hcd, PORT_PE);
> > > > break;
> > > > case USB_PORT_FEAT_C_ENABLE:
> > > > /* XXX error? */
> > > > break;
> > > > case USB_PORT_FEAT_SUSPEND:
> > > > - if (temp & PORT_RESET)
> > > > + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> > > > goto error;
> > > >
> > > > - if (temp & PORT_SUSPEND) {
> > > > - if ((temp & PORT_PE) == 0)
> > > > + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND)) {
> > > > + if (!isp1760_hcd_is_set(hcd, PORT_PE))
> > > > goto error;
> > > > /* resume signaling for 20 msec */
> > > > - temp &= ~(PORT_RWC_BITS);
> > > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > > - temp | PORT_RESUME);
> > > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > > + isp1760_hcd_set(hcd, PORT_RESUME);
> > > > +
> > > > priv->reset_done = jiffies +
> > > > msecs_to_jiffies(USB_RESUME_TIMEOUT);
> > > > }
> > > > @@ -1872,12 +1910,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > /* we auto-clear this feature */
> > > > break;
> > > > case USB_PORT_FEAT_POWER:
> > > > - if (HCS_PPC(priv->hcs_params))
> > > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > > - temp & ~PORT_POWER);
> > > > + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> > > > + isp1760_hcd_clear(hcd, PORT_POWER);
> > > > break;
> > > > case USB_PORT_FEAT_C_CONNECTION:
> > > > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_CSC);
> > > > + isp1760_hcd_set(hcd, PORT_CSC);
> > > > break;
> > > > case USB_PORT_FEAT_C_OVER_CURRENT:
> > > > /* XXX error ?*/
> > > > @@ -1888,7 +1925,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > default:
> > > > goto error;
> > > > }
> > > > - reg_read32(hcd->regs, HC_USBCMD);
> > > > + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> > > > break;
> > > > case GetHubDescriptor:
> > > > isp1760_hub_descriptor(priv, (struct usb_hub_descriptor *)
> > > > @@ -1903,15 +1940,14 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > goto error;
> > > > wIndex--;
> > > > status = 0;
> > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > >
> > > > /* wPortChange bits */
> > > > - if (temp & PORT_CSC)
> > > > + if (isp1760_hcd_is_set(hcd, PORT_CSC))
> > > > status |= USB_PORT_STAT_C_CONNECTION << 16;
> > > >
> > > >
> > > > /* whoever resumes must GetPortStatus to complete it!! */
> > > > - if (temp & PORT_RESUME) {
> > > > + if (isp1760_hcd_is_set(hcd, PORT_RESUME)) {
> > > > dev_err(hcd->self.controller, "Port resume should be skipped.\n");
> > > >
> > > > /* Remote Wakeup received? */
> > > > @@ -1930,35 +1966,31 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > priv->reset_done = 0;
> > > >
> > > > /* stop resume signaling */
> > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > > - temp & ~(PORT_RWC_BITS | PORT_RESUME));
> > > > - retval = handshake(hcd, HC_PORTSC1,
> > > > - PORT_RESUME, 0, 2000 /* 2msec */);
> > > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > > +
> > > > + retval = isp1760_hcd_clear_poll_timeout(hcd,
> > > > + PORT_RESUME, 2000);
> > > > if (retval != 0) {
> > > > dev_err(hcd->self.controller,
> > > > "port %d resume error %d\n",
> > > > wIndex + 1, retval);
> > > > goto error;
> > > > }
> > > > - temp &= ~(PORT_SUSPEND|PORT_RESUME|(3<<10));
> > > > }
> > > > }
> > > >
> > > > /* whoever resets must GetPortStatus to complete it!! */
> > > > - if ((temp & PORT_RESET)
> > > > - && time_after_eq(jiffies,
> > > > - priv->reset_done)) {
> > > > + if (isp1760_hcd_is_set(hcd, PORT_RESET) &&
> > > > + time_after_eq(jiffies, priv->reset_done)) {
> > > > status |= USB_PORT_STAT_C_RESET << 16;
> > > > priv->reset_done = 0;
> > > >
> > > > /* force reset to complete */
> > > > - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_RESET);
> > > > /* REVISIT: some hardware needs 550+ usec to clear
> > > > * this bit; seems too long to spin routinely...
> > > > */
> > > > - retval = handshake(hcd, HC_PORTSC1,
> > > > - PORT_RESET, 0, 750);
> > > > + retval = isp1760_hcd_clear_poll_timeout(hcd, PORT_RESET,
> > > > + 750);
> > > > if (retval != 0) {
> > > > dev_err(hcd->self.controller, "port %d reset error %d\n",
> > > > wIndex + 1, retval);
> > > > @@ -1966,8 +1998,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > }
> > > >
> > > > /* see what we found out */
> > > > - temp = check_reset_complete(hcd, wIndex,
> > > > - reg_read32(hcd->regs, HC_PORTSC1));
> > > > + check_reset_complete(hcd, wIndex);
> > > > }
> > > > /*
> > > > * Even if OWNER is set, there's no harm letting hub_wq
> > > > @@ -1975,21 +2006,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > * for PORT_POWER anyway).
> > > > */
> > > >
> > > > - if (temp & PORT_OWNER)
> > > > + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> > > > dev_err(hcd->self.controller, "PORT_OWNER is set\n");
> > > >
> > > > - if (temp & PORT_CONNECT) {
> > > > + if (isp1760_hcd_is_set(hcd, PORT_CONNECT)) {
> > > > status |= USB_PORT_STAT_CONNECTION;
> > > > /* status may be from integrated TT */
> > > > status |= USB_PORT_STAT_HIGH_SPEED;
> > > > }
> > > > - if (temp & PORT_PE)
> > > > + if (isp1760_hcd_is_set(hcd, PORT_PE))
> > > > status |= USB_PORT_STAT_ENABLE;
> > > > - if (temp & (PORT_SUSPEND|PORT_RESUME))
> > > > + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND) &&
> > > > + isp1760_hcd_is_set(hcd, PORT_RESUME))
> > > > status |= USB_PORT_STAT_SUSPEND;
> > > > - if (temp & PORT_RESET)
> > > > + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> > > > status |= USB_PORT_STAT_RESET;
> > > > - if (temp & PORT_POWER)
> > > > + if (isp1760_hcd_is_set(hcd, PORT_POWER))
> > > > status |= USB_PORT_STAT_POWER;
> > > >
> > > > put_unaligned(cpu_to_le32(status), (__le32 *) buf);
> > > > @@ -2009,41 +2041,39 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > if (!wIndex || wIndex > ports)
> > > > goto error;
> > > > wIndex--;
> > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > > - if (temp & PORT_OWNER)
> > > > + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> > > > break;
> > > >
> > > > -/* temp &= ~PORT_RWC_BITS; */
> > > > switch (wValue) {
> > > > case USB_PORT_FEAT_ENABLE:
> > > > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_PE);
> > > > + isp1760_hcd_set(hcd, PORT_PE);
> > > > break;
> > > >
> > > > case USB_PORT_FEAT_SUSPEND:
> > > > - if ((temp & PORT_PE) == 0
> > > > - || (temp & PORT_RESET) != 0)
> > > > + if (!isp1760_hcd_is_set(hcd, PORT_PE) ||
> > > > + isp1760_hcd_is_set(hcd, PORT_RESET))
> > > > goto error;
> > > >
> > > > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_SUSPEND);
> > > > + isp1760_hcd_set(hcd, PORT_SUSPEND);
> > > > break;
> > > > case USB_PORT_FEAT_POWER:
> > > > - if (HCS_PPC(priv->hcs_params))
> > > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > > - temp | PORT_POWER);
> > > > + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> > > > + isp1760_hcd_set(hcd, PORT_POWER);
> > > > break;
> > > > case USB_PORT_FEAT_RESET:
> > > > - if (temp & PORT_RESUME)
> > > > + if (isp1760_hcd_is_set(hcd, PORT_RESUME))
> > > > goto error;
> > > > /* line status bits may report this as low speed,
> > > > * which can be fine if this root hub has a
> > > > * transaction translator built in.
> > > > */
> > > > - if ((temp & (PORT_PE|PORT_CONNECT)) == PORT_CONNECT
> > > > - && PORT_USB11(temp)) {
> > > > - temp |= PORT_OWNER;
> > > > + if ((isp1760_hcd_is_set(hcd, PORT_CONNECT) &&
> > > > + !isp1760_hcd_is_set(hcd, PORT_PE)) &&
> > > > + (isp1760_hcd_read(hcd, PORT_LSTATUS) == 1)) {
> > > > + isp1760_hcd_set(hcd, PORT_OWNER);
> > > > } else {
> > > > - temp |= PORT_RESET;
> > > > - temp &= ~PORT_PE;
> > > > + isp1760_hcd_set(hcd, PORT_RESET);
> > > > + isp1760_hcd_clear(hcd, PORT_PE);
> > > >
> > > > /*
> > > > * caller must wait, then call GetPortStatus
> > > > @@ -2052,12 +2082,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > priv->reset_done = jiffies +
> > > > msecs_to_jiffies(50);
> > > > }
> > > > - reg_write32(hcd->regs, HC_PORTSC1, temp);
> > > > break;
> > > > default:
> > > > goto error;
> > > > }
> > > > - reg_read32(hcd->regs, HC_USBCMD);
> > > > + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> > > > break;
> > > >
> > > > default:
> > > > @@ -2074,14 +2103,13 @@ static int isp1760_get_frame(struct usb_hcd *hcd)
> > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > u32 fr;
> > > >
> > > > - fr = reg_read32(hcd->regs, HC_FRINDEX);
> > > > + fr = isp1760_hcd_read(hcd, HC_FRINDEX);
> > > > return (fr >> 3) % priv->periodic_size;
> > > > }
> > > >
> > > > static void isp1760_stop(struct usb_hcd *hcd)
> > > > {
> > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > - u32 temp;
> > > >
> > > > del_timer(&errata2_timer);
> > > >
> > > > @@ -2092,24 +2120,19 @@ static void isp1760_stop(struct usb_hcd *hcd)
> > > > spin_lock_irq(&priv->lock);
> > > > ehci_reset(hcd);
> > > > /* Disable IRQ */
> > > > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
> > > > + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> > > > spin_unlock_irq(&priv->lock);
> > > >
> > > > - reg_write32(hcd->regs, HC_CONFIGFLAG, 0);
> > > > + isp1760_hcd_clear(hcd, FLAG_CF);
> > > > }
> > > >
> > > > static void isp1760_shutdown(struct usb_hcd *hcd)
> > > > {
> > > > - u32 command, temp;
> > > > -
> > > > isp1760_stop(hcd);
> > > > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
> > > >
> > > > - command = reg_read32(hcd->regs, HC_USBCMD);
> > > > - command &= ~CMD_RUN;
> > > > - reg_write32(hcd->regs, HC_USBCMD, command);
> > > > + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> > > > +
> > > > + isp1760_hcd_clear(hcd, CMD_RUN);
> > > > }
> > > >
> > > > static void isp1760_clear_tt_buffer_complete(struct usb_hcd *hcd,
> > > > @@ -2182,8 +2205,8 @@ void isp1760_deinit_kmem_cache(void)
> > > > kmem_cache_destroy(urb_listitem_cachep);
> > > > }
> > > >
> > > > -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > > > - struct resource *mem, int irq, unsigned long irqflags,
> > > > +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> > > > + int irq, unsigned long irqflags,
> > > > struct device *dev)
> > > > {
> > > > struct usb_hcd *hcd;
> > > > @@ -2200,7 +2223,6 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > > > init_memory(priv);
> > > >
> > > > hcd->irq = irq;
> > > > - hcd->regs = regs;
> > > > hcd->rsrc_start = mem->start;
> > > > hcd->rsrc_len = resource_size(mem);
> > > >
> > > > diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
> > > > index f1bb2deb1ccf..34e1899e52c4 100644
> > > > --- a/drivers/usb/isp1760/isp1760-hcd.h
> > > > +++ b/drivers/usb/isp1760/isp1760-hcd.h
> > > > @@ -3,6 +3,9 @@
> > > > #define _ISP1760_HCD_H_
> > > >
> > > > #include <linux/spinlock.h>
> > > > +#include <linux/regmap.h>
> > > > +
> > > > +#include "isp1760-regs.h"
> > > >
> > > > struct isp1760_qh;
> > > > struct isp1760_qtd;
> > > > @@ -48,10 +51,13 @@ enum isp1760_queue_head_types {
> > > > };
> > > >
> > > > struct isp1760_hcd {
> > > > -#ifdef CONFIG_USB_ISP1760_HCD
> > > > struct usb_hcd *hcd;
> > > >
> > > > - u32 hcs_params;
> > > > + void __iomem *base;
> > > > +
> > > > + struct regmap *regs;
> > > > + struct regmap_field *fields[HC_FIELD_MAX];
> > > > +
> > > > spinlock_t lock;
> > > > struct isp1760_slotinfo atl_slots[32];
> > > > int atl_done_map;
> > > > @@ -66,20 +72,18 @@ struct isp1760_hcd {
> > > > unsigned i_thresh;
> > > > unsigned long reset_done;
> > > > unsigned long next_statechange;
> > > > -#endif
> > > > };
> > > >
> > > > #ifdef CONFIG_USB_ISP1760_HCD
> > > > -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > > > - struct resource *mem, int irq, unsigned long irqflags,
> > > > - struct device *dev);
> > > > +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> > > > + int irq, unsigned long irqflags, struct device *dev);
> > > > void isp1760_hcd_unregister(struct isp1760_hcd *priv);
> > > >
> > > > int isp1760_init_kmem_once(void);
> > > > void isp1760_deinit_kmem_cache(void);
> > > > #else
> > > > static inline int isp1760_hcd_register(struct isp1760_hcd *priv,
> > > > - void __iomem *regs, struct resource *mem,
> > > > + struct resource *mem,
> > > > int irq, unsigned long irqflags,
> > > > struct device *dev)
> > > > {
> > > > diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
> > > > index ccd30f835888..abfba9f5ec23 100644
> > > > --- a/drivers/usb/isp1760/isp1760-if.c
> > > > +++ b/drivers/usb/isp1760/isp1760-if.c
> > > > @@ -75,9 +75,9 @@ static int isp1761_pci_init(struct pci_dev *dev)
> > > > /*by default host is in 16bit mode, so
> > > > * io operations at this stage must be 16 bit
> > > > * */
> > > > - writel(0xface, iobase + HC_SCRATCH_REG);
> > > > + writel(0xface, iobase + ISP176x_HC_SCRATCH);
> > > > udelay(100);
> > > > - reg_data = readl(iobase + HC_SCRATCH_REG) & 0x0000ffff;
> > > > + reg_data = readl(iobase + ISP176x_HC_SCRATCH) & 0x0000ffff;
> > > > retry_count--;
> > > > }
> > > >
> > > > diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
> > > > index fedc4f5cded0..42ee4404c90b 100644
> > > > --- a/drivers/usb/isp1760/isp1760-regs.h
> > > > +++ b/drivers/usb/isp1760/isp1760-regs.h
> > > > @@ -10,218 +10,286 @@
> > > > * Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > > */
> > > >
> > > > -#ifndef _ISP1760_REGS_H_
> > > > -#define _ISP1760_REGS_H_
> > > > +#ifndef _ISP176x_REGS_H_
> > > > +#define _ISP176x_REGS_H_
> > > > +
> > > > +#include <linux/regmap.h>
> > > >
> > > > /* -----------------------------------------------------------------------------
> > > > * Host Controller
> > > > */
> > > >
> > > > /* EHCI capability registers */
> > > > -#define HC_CAPLENGTH 0x000
> > > > -#define HC_LENGTH(p) (((p) >> 00) & 0x00ff) /* bits 7:0 */
> > > > -#define HC_VERSION(p) (((p) >> 16) & 0xffff) /* bits 31:16 */
> > > > -
> > > > -#define HC_HCSPARAMS 0x004
> > > > -#define HCS_INDICATOR(p) ((p) & (1 << 16)) /* true: has port indicators */
> > > > -#define HCS_PPC(p) ((p) & (1 << 4)) /* true: port power control */
> > > > -#define HCS_N_PORTS(p) (((p) >> 0) & 0xf) /* bits 3:0, ports on HC */
> > > > -
> > > > -#define HC_HCCPARAMS 0x008
> > > > -#define HCC_ISOC_CACHE(p) ((p) & (1 << 7)) /* true: can cache isoc frame */
> > > > -#define HCC_ISOC_THRES(p) (((p) >> 4) & 0x7) /* bits 6:4, uframes cached */
> > > > +#define ISP176x_HC_CAPLENGTH 0x000
> > > > +#define ISP176x_HC_VERSION 0x002
> > > > +#define ISP176x_HC_HCSPARAMS 0x004
> > > > +#define ISP176x_HC_HCCPARAMS 0x008
> > > >
> > > > /* EHCI operational registers */
> > > > -#define HC_USBCMD 0x020
> > > > -#define CMD_LRESET (1 << 7) /* partial reset (no ports, etc) */
> > > > -#define CMD_RESET (1 << 1) /* reset HC not bus */
> > > > -#define CMD_RUN (1 << 0) /* start/stop HC */
> > > > -
> > > > -#define HC_USBSTS 0x024
> > > > -#define STS_PCD (1 << 2) /* port change detect */
> > > > -
> > > > -#define HC_FRINDEX 0x02c
> > > > -
> > > > -#define HC_CONFIGFLAG 0x060
> > > > -#define FLAG_CF (1 << 0) /* true: we'll support "high speed" */
> > > > -
> > > > -#define HC_PORTSC1 0x064
> > > > -#define PORT_OWNER (1 << 13) /* true: companion hc owns this port */
> > > > -#define PORT_POWER (1 << 12) /* true: has power (see PPC) */
> > > > -#define PORT_USB11(x) (((x) & (3 << 10)) == (1 << 10)) /* USB 1.1 device */
> > > > -#define PORT_RESET (1 << 8) /* reset port */
> > > > -#define PORT_SUSPEND (1 << 7) /* suspend port */
> > > > -#define PORT_RESUME (1 << 6) /* resume it */
> > > > -#define PORT_PE (1 << 2) /* port enable */
> > > > -#define PORT_CSC (1 << 1) /* connect status change */
> > > > -#define PORT_CONNECT (1 << 0) /* device connected */
> > > > -#define PORT_RWC_BITS (PORT_CSC)
> > > > -
> > > > -#define HC_ISO_PTD_DONEMAP_REG 0x130
> > > > -#define HC_ISO_PTD_SKIPMAP_REG 0x134
> > > > -#define HC_ISO_PTD_LASTPTD_REG 0x138
> > > > -#define HC_INT_PTD_DONEMAP_REG 0x140
> > > > -#define HC_INT_PTD_SKIPMAP_REG 0x144
> > > > -#define HC_INT_PTD_LASTPTD_REG 0x148
> > > > -#define HC_ATL_PTD_DONEMAP_REG 0x150
> > > > -#define HC_ATL_PTD_SKIPMAP_REG 0x154
> > > > -#define HC_ATL_PTD_LASTPTD_REG 0x158
> > > > +#define ISP176x_HC_USBCMD 0x020
> > > > +#define ISP176x_HC_USBSTS 0x024
> > > > +#define ISP176x_HC_FRINDEX 0x02c
> > > > +
> > > > +#define ISP176x_HC_CONFIGFLAG 0x060
> > > > +#define ISP176x_HC_PORTSC1 0x064
> > > > +
> > > > +#define ISP176x_HC_ISO_PTD_DONEMAP 0x130
> > > > +#define ISP176x_HC_ISO_PTD_SKIPMAP 0x134
> > > > +#define ISP176x_HC_ISO_PTD_LASTPTD 0x138
> > > > +#define ISP176x_HC_INT_PTD_DONEMAP 0x140
> > > > +#define ISP176x_HC_INT_PTD_SKIPMAP 0x144
> > > > +#define ISP176x_HC_INT_PTD_LASTPTD 0x148
> > > > +#define ISP176x_HC_ATL_PTD_DONEMAP 0x150
> > > > +#define ISP176x_HC_ATL_PTD_SKIPMAP 0x154
> > > > +#define ISP176x_HC_ATL_PTD_LASTPTD 0x158
> > > >
> > > > /* Configuration Register */
> > > > -#define HC_HW_MODE_CTRL 0x300
> > > > -#define ALL_ATX_RESET (1 << 31)
> > > > -#define HW_ANA_DIGI_OC (1 << 15)
> > > > -#define HW_DEV_DMA (1 << 11)
> > > > -#define HW_COMN_IRQ (1 << 10)
> > > > -#define HW_COMN_DMA (1 << 9)
> > > > -#define HW_DATA_BUS_32BIT (1 << 8)
> > > > -#define HW_DACK_POL_HIGH (1 << 6)
> > > > -#define HW_DREQ_POL_HIGH (1 << 5)
> > > > -#define HW_INTR_HIGH_ACT (1 << 2)
> > > > -#define HW_INTR_EDGE_TRIG (1 << 1)
> > > > -#define HW_GLOBAL_INTR_EN (1 << 0)
> > > > -
> > > > -#define HC_CHIP_ID_REG 0x304
> > > > -#define HC_SCRATCH_REG 0x308
> > > > -
> > > > -#define HC_RESET_REG 0x30c
> > > > -#define SW_RESET_RESET_HC (1 << 1)
> > > > -#define SW_RESET_RESET_ALL (1 << 0)
> > > > -
> > > > -#define HC_BUFFER_STATUS_REG 0x334
> > > > -#define ISO_BUF_FILL (1 << 2)
> > > > -#define INT_BUF_FILL (1 << 1)
> > > > -#define ATL_BUF_FILL (1 << 0)
> > > > -
> > > > -#define HC_MEMORY_REG 0x33c
> > > > -#define ISP_BANK(x) ((x) << 16)
> > > > -
> > > > -#define HC_PORT1_CTRL 0x374
> > > > -#define PORT1_POWER (3 << 3)
> > > > -#define PORT1_INIT1 (1 << 7)
> > > > -#define PORT1_INIT2 (1 << 23)
> > > > -#define HW_OTG_CTRL_SET 0x374
> > > > -#define HW_OTG_CTRL_CLR 0x376
> > > > -#define HW_OTG_DISABLE (1 << 10)
> > > > -#define HW_OTG_SE0_EN (1 << 9)
> > > > -#define HW_BDIS_ACON_EN (1 << 8)
> > > > -#define HW_SW_SEL_HC_DC (1 << 7)
> > > > -#define HW_VBUS_CHRG (1 << 6)
> > > > -#define HW_VBUS_DISCHRG (1 << 5)
> > > > -#define HW_VBUS_DRV (1 << 4)
> > > > -#define HW_SEL_CP_EXT (1 << 3)
> > > > -#define HW_DM_PULLDOWN (1 << 2)
> > > > -#define HW_DP_PULLDOWN (1 << 1)
> > > > -#define HW_DP_PULLUP (1 << 0)
> > > > +#define ISP176x_HC_HW_MODE_CTRL 0x300
> > > > +#define ISP176x_HC_CHIP_ID 0x304
> > > > +#define ISP176x_HC_SCRATCH 0x308
> > > > +#define ISP176x_HC_RESET 0x30c
> > > > +#define ISP176x_HC_BUFFER_STATUS 0x334
> > > > +#define ISP176x_HC_MEMORY 0x33c
> > > >
> > > > /* Interrupt Register */
> > > > -#define HC_INTERRUPT_REG 0x310
> > > > -
> > > > -#define HC_INTERRUPT_ENABLE 0x314
> > > > -#define HC_ISO_INT (1 << 9)
> > > > -#define HC_ATL_INT (1 << 8)
> > > > -#define HC_INTL_INT (1 << 7)
> > > > -#define HC_EOT_INT (1 << 3)
> > > > -#define HC_SOT_INT (1 << 1)
> > > > -#define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT)
> > > > -
> > > > -#define HC_ISO_IRQ_MASK_OR_REG 0x318
> > > > -#define HC_INT_IRQ_MASK_OR_REG 0x31c
> > > > -#define HC_ATL_IRQ_MASK_OR_REG 0x320
> > > > -#define HC_ISO_IRQ_MASK_AND_REG 0x324
> > > > -#define HC_INT_IRQ_MASK_AND_REG 0x328
> > > > -#define HC_ATL_IRQ_MASK_AND_REG 0x32c
> > > > +#define ISP176x_HC_INTERRUPT 0x310
> > > > +#define ISP176x_HC_INTERRUPT_ENABLE 0x314
> > > > +#define ISP176x_HC_ISO_IRQ_MASK_OR 0x318
> > > > +#define ISP176x_HC_INT_IRQ_MASK_OR 0x31c
> > > > +#define ISP176x_HC_ATL_IRQ_MASK_OR 0x320
> > > > +#define ISP176x_HC_ISO_IRQ_MASK_AND 0x324
> > > > +#define ISP176x_HC_INT_IRQ_MASK_AND 0x328
> > > > +#define ISP176x_HC_ATL_IRQ_MASK_AND 0x32c
> > > > +
> > > > +static const struct regmap_range isp176x_hc_volatile_ranges[] = {
> > > > + regmap_reg_range(ISP176x_HC_USBCMD, ISP176x_HC_ATL_PTD_LASTPTD),
> > > > + regmap_reg_range(ISP176x_HC_BUFFER_STATUS, ISP176x_HC_MEMORY),
> > > > + regmap_reg_range(ISP176x_HC_INTERRUPT, ISP176x_HC_ATL_IRQ_MASK_AND),
> > > > +};
> > > > +
> > > > +static const struct regmap_access_table isp176x_hc_volatile_table = {
> > > > + .yes_ranges = isp176x_hc_volatile_ranges,
> > > > + .n_yes_ranges = ARRAY_SIZE(isp176x_hc_volatile_ranges),
> > > > +};
> > >
> > > These belong to a .c file.
> >
> > yup, can move them and all below.
> >
> > >
> > > > +
> > > > +enum isp176x_host_controller_fields {
> > > > + /* HC_HCSPARAMS */
> > > > + HCS_PPC, HCS_N_PORTS,
> > > > + /* HC_HCCPARAMS */
> > > > + HCC_ISOC_CACHE, HCC_ISOC_THRES,
> > > > + /* HC_USBCMD */
> > > > + CMD_LRESET, CMD_RESET, CMD_RUN,
> > > > + /* HC_USBSTS */
> > > > + STS_PCD,
> > > > + /* HC_FRINDEX */
> > > > + HC_FRINDEX,
> > > > + /* HC_CONFIGFLAG */
> > > > + FLAG_CF,
> > > > + /* HC_PORTSC1 */
> > > > + PORT_OWNER, PORT_POWER, PORT_LSTATUS, PORT_RESET, PORT_SUSPEND,
> > > > + PORT_RESUME, PORT_PE, PORT_CSC, PORT_CONNECT,
> > > > + /* HC_HW_MODE_CTRL */
> > > > + ALL_ATX_RESET, HW_ANA_DIGI_OC, HW_DEV_DMA, HW_COMN_IRQ, HW_COMN_DMA,
> > > > + HW_DATA_BUS_WIDTH, HW_DACK_POL_HIGH, HW_DREQ_POL_HIGH, HW_INTR_HIGH_ACT,
> > > > + HW_INTR_EDGE_TRIG, HW_GLOBAL_INTR_EN,
> > > > + /* HC_RESET */
> > > > + SW_RESET_RESET_HC, SW_RESET_RESET_ALL,
> > > > + /* HC_BUFFER_STATUS */
> > > > + INT_BUF_FILL, ATL_BUF_FILL,
> > > > + /* HC_MEMORY */
> > > > + MEM_BANK_SEL, MEM_START_ADDR,
> > > > + /* HC_INTERRUPT_ENABLE */
> > > > + HC_INT_ENABLE,
> > > > + /* Last element */
> > > > + HC_FIELD_MAX,
> > > > +};
> > > > +
> > > > +static const struct reg_field isp1760_hc_reg_fields[] = {
> > > > + [HCS_PPC] = REG_FIELD(ISP176x_HC_HCSPARAMS, 4, 4),
> > > > + [HCS_N_PORTS] = REG_FIELD(ISP176x_HC_HCSPARAMS, 0, 3),
> > > > + [HCC_ISOC_CACHE] = REG_FIELD(ISP176x_HC_HCCPARAMS, 7, 7),
> > > > + [HCC_ISOC_THRES] = REG_FIELD(ISP176x_HC_HCCPARAMS, 4, 6),
> > > > + [CMD_LRESET] = REG_FIELD(ISP176x_HC_USBCMD, 7, 7),
> > > > + [CMD_RESET] = REG_FIELD(ISP176x_HC_USBCMD, 1, 1),
> > > > + [CMD_RUN] = REG_FIELD(ISP176x_HC_USBCMD, 0, 0),
> > > > + [STS_PCD] = REG_FIELD(ISP176x_HC_USBSTS, 2, 2),
> > > > + [HC_FRINDEX] = REG_FIELD(ISP176x_HC_FRINDEX, 0, 13),
> > > > + [FLAG_CF] = REG_FIELD(ISP176x_HC_CONFIGFLAG, 0, 0),
> > > > + [PORT_OWNER] = REG_FIELD(ISP176x_HC_PORTSC1, 13, 13),
> > > > + [PORT_POWER] = REG_FIELD(ISP176x_HC_PORTSC1, 12, 12),
> > > > + [PORT_LSTATUS] = REG_FIELD(ISP176x_HC_PORTSC1, 10, 11),
> > > > + [PORT_RESET] = REG_FIELD(ISP176x_HC_PORTSC1, 8, 8),
> > > > + [PORT_SUSPEND] = REG_FIELD(ISP176x_HC_PORTSC1, 7, 7),
> > > > + [PORT_RESUME] = REG_FIELD(ISP176x_HC_PORTSC1, 6, 6),
> > > > + [PORT_PE] = REG_FIELD(ISP176x_HC_PORTSC1, 2, 2),
> > > > + [PORT_CSC] = REG_FIELD(ISP176x_HC_PORTSC1, 1, 1),
> > > > + [PORT_CONNECT] = REG_FIELD(ISP176x_HC_PORTSC1, 0, 0),
> > > > + [ALL_ATX_RESET] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 31, 31),
> > > > + [HW_ANA_DIGI_OC] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 15, 15),
> > > > + [HW_COMN_IRQ] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 10, 10),
> > > > + [HW_DATA_BUS_WIDTH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 8, 8),
> > > > + [HW_DACK_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 6, 6),
> > > > + [HW_DREQ_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 5, 5),
> > > > + [HW_INTR_HIGH_ACT] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 2, 2),
> > > > + [HW_INTR_EDGE_TRIG] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 1, 1),
> > > > + [HW_GLOBAL_INTR_EN] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 0, 0),
> > > > + [SW_RESET_RESET_ALL] = REG_FIELD(ISP176x_HC_RESET, 0, 0),
> > > > + [INT_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 1, 1),
> > > > + [ATL_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 0, 0),
> > > > + [MEM_BANK_SEL] = REG_FIELD(ISP176x_HC_MEMORY, 16, 17),
> > > > + [MEM_START_ADDR] = REG_FIELD(ISP176x_HC_MEMORY, 0, 15),
> > > > + [HC_INT_ENABLE] = REG_FIELD(ISP176x_HC_INTERRUPT_ENABLE, 7, 8),
> > > > +};
> > >
> > > This too.
> > >
> > > >
> > > > /* -----------------------------------------------------------------------------
> > > > * Peripheral Controller
> > > > */
> > > >
> > > > -/* Initialization Registers */
> > > > -#define DC_ADDRESS 0x0200
> > > > -#define DC_DEVEN (1 << 7)
> > > > -
> > > > -#define DC_MODE 0x020c
> > > > -#define DC_DMACLKON (1 << 9)
> > > > -#define DC_VBUSSTAT (1 << 8)
> > > > -#define DC_CLKAON (1 << 7)
> > > > -#define DC_SNDRSU (1 << 6)
> > > > -#define DC_GOSUSP (1 << 5)
> > > > -#define DC_SFRESET (1 << 4)
> > > > -#define DC_GLINTENA (1 << 3)
> > > > -#define DC_WKUPCS (1 << 2)
> > > > -
> > > > -#define DC_INTCONF 0x0210
> > > > -#define DC_CDBGMOD_ACK_NAK (0 << 6)
> > > > -#define DC_CDBGMOD_ACK (1 << 6)
> > > > -#define DC_CDBGMOD_ACK_1NAK (2 << 6)
> > > > -#define DC_DDBGMODIN_ACK_NAK (0 << 4)
> > > > -#define DC_DDBGMODIN_ACK (1 << 4)
> > > > -#define DC_DDBGMODIN_ACK_1NAK (2 << 4)
> > > > -#define DC_DDBGMODOUT_ACK_NYET_NAK (0 << 2)
> > > > -#define DC_DDBGMODOUT_ACK_NYET (1 << 2)
> > > > -#define DC_DDBGMODOUT_ACK_NYET_1NAK (2 << 2)
> > > > -#define DC_INTLVL (1 << 1)
> > > > -#define DC_INTPOL (1 << 0)
> > > > -
> > > > -#define DC_DEBUG 0x0212
> > > > -#define DC_INTENABLE 0x0214
> > > > #define DC_IEPTX(n) (1 << (11 + 2 * (n)))
> > > > #define DC_IEPRX(n) (1 << (10 + 2 * (n)))
> > > > #define DC_IEPRXTX(n) (3 << (10 + 2 * (n)))
> > > > -#define DC_IEP0SETUP (1 << 8)
> > > > -#define DC_IEVBUS (1 << 7)
> > > > -#define DC_IEDMA (1 << 6)
> > > > -#define DC_IEHS_STA (1 << 5)
> > > > -#define DC_IERESM (1 << 4)
> > > > -#define DC_IESUSP (1 << 3)
> > > > -#define DC_IEPSOF (1 << 2)
> > > > -#define DC_IESOF (1 << 1)
> > > > -#define DC_IEBRST (1 << 0)
> > > > +
> > > > +#define ISP176x_DC_ENDPTYP_ISOC 0x01
> > > > +#define ISP176x_DC_ENDPTYP_BULK 0x02
> > > > +#define ISP176x_DC_ENDPTYP_INTERRUPT 0x03
> > > > +
> > > > +/* Initialization Registers */
> > > > +#define ISP176x_DC_ADDRESS 0x0200
> > > > +#define ISP176x_DC_MODE 0x020c
> > > > +#define ISP176x_DC_INTCONF 0x0210
> > > > +#define ISP176x_DC_DEBUG 0x0212
> > > > +#define ISP176x_DC_INTENABLE 0x0214
> > > >
> > > > /* Data Flow Registers */
> > > > -#define DC_EPINDEX 0x022c
> > > > -#define DC_EP0SETUP (1 << 5)
> > > > -#define DC_ENDPIDX(n) ((n) << 1)
> > > > -#define DC_EPDIR (1 << 0)
> > > > -
> > > > -#define DC_CTRLFUNC 0x0228
> > > > -#define DC_CLBUF (1 << 4)
> > > > -#define DC_VENDP (1 << 3)
> > > > -#define DC_DSEN (1 << 2)
> > > > -#define DC_STATUS (1 << 1)
> > > > -#define DC_STALL (1 << 0)
> > > > -
> > > > -#define DC_DATAPORT 0x0220
> > > > -#define DC_BUFLEN 0x021c
> > > > -#define DC_DATACOUNT_MASK 0xffff
> > > > -#define DC_BUFSTAT 0x021e
> > > > -#define DC_EPMAXPKTSZ 0x0204
> > > > -
> > > > -#define DC_EPTYPE 0x0208
> > > > -#define DC_NOEMPKT (1 << 4)
> > > > -#define DC_EPENABLE (1 << 3)
> > > > -#define DC_DBLBUF (1 << 2)
> > > > -#define DC_ENDPTYP_ISOC (1 << 0)
> > > > -#define DC_ENDPTYP_BULK (2 << 0)
> > > > -#define DC_ENDPTYP_INTERRUPT (3 << 0)
> > > > +#define ISP176x_DC_EPMAXPKTSZ 0x0204
> > > > +#define ISP176x_DC_EPTYPE 0x0208
> > > > +
> > > > +#define ISP176x_DC_BUFLEN 0x021c
> > > > +#define ISP176x_DC_BUFSTAT 0x021e
> > > > +#define ISP176x_DC_DATAPORT 0x0220
> > > > +
> > > > +#define ISP176x_DC_CTRLFUNC 0x0228
> > > > +#define ISP176x_DC_EPINDEX 0x022c
> > > > +
> > > > +#define ISP1761_DC_OTG_CTRL_SET 0x374
> > > > +#define ISP1761_DC_OTG_CTRL_CLEAR 0x376
> > > >
> > > > /* DMA Registers */
> > > > -#define DC_DMACMD 0x0230
> > > > -#define DC_DMATXCOUNT 0x0234
> > > > -#define DC_DMACONF 0x0238
> > > > -#define DC_DMAHW 0x023c
> > > > -#define DC_DMAINTREASON 0x0250
> > > > -#define DC_DMAINTEN 0x0254
> > > > -#define DC_DMAEP 0x0258
> > > > -#define DC_DMABURSTCOUNT 0x0264
> > > > +#define ISP176x_DC_DMACMD 0x0230
> > > > +#define ISP176x_DC_DMATXCOUNT 0x0234
> > > > +#define ISP176x_DC_DMACONF 0x0238
> > > > +#define ISP176x_DC_DMAHW 0x023c
> > > > +#define ISP176x_DC_DMAINTREASON 0x0250
> > > > +#define ISP176x_DC_DMAINTEN 0x0254
> > > > +#define ISP176x_DC_DMAEP 0x0258
> > > > +#define ISP176x_DC_DMABURSTCOUNT 0x0264
> > > >
> > > > /* General Registers */
> > > > -#define DC_INTERRUPT 0x0218
> > > > -#define DC_CHIPID 0x0270
> > > > -#define DC_FRAMENUM 0x0274
> > > > -#define DC_SCRATCH 0x0278
> > > > -#define DC_UNLOCKDEV 0x027c
> > > > -#define DC_INTPULSEWIDTH 0x0280
> > > > -#define DC_TESTMODE 0x0284
> > > > +#define ISP176x_DC_INTERRUPT 0x0218
> > > > +#define ISP176x_DC_CHIPID 0x0270
> > > > +#define ISP176x_DC_FRAMENUM 0x0274
> > > > +#define ISP176x_DC_SCRATCH 0x0278
> > > > +#define ISP176x_DC_UNLOCKDEV 0x027c
> > > > +#define ISP176x_DC_INTPULSEWIDTH 0x0280
> > > > +#define ISP176x_DC_TESTMODE 0x0284
> > > > +
> > > > +static const struct regmap_range isp176x_dc_volatile_ranges[] = {
> > > > + regmap_reg_range(ISP176x_DC_EPMAXPKTSZ, ISP176x_DC_EPTYPE),
> > > > + regmap_reg_range(ISP176x_DC_BUFLEN, ISP176x_DC_EPINDEX),
> > > > + regmap_reg_range(ISP1761_DC_OTG_CTRL_SET, ISP1761_DC_OTG_CTRL_CLEAR),
> > > > +};
> > > > +
> > > > +static const struct regmap_access_table isp176x_dc_volatile_table = {
> > > > + .yes_ranges = isp176x_dc_volatile_ranges,
> > > > + .n_yes_ranges = ARRAY_SIZE(isp176x_dc_volatile_ranges),
> > > > +};
> > > > +
> > > > +enum isp176x_device_controller_fields {
> > > > + /* DC_ADDRESS */
> > > > + DC_DEVEN, DC_DEVADDR,
> > > > + /* DC_MODE */
> > > > + DC_VBUSSTAT, DC_SFRESET, DC_GLINTENA,
> > > > + /* DC_INTCONF */
> > > > + DC_CDBGMOD_ACK, DC_DDBGMODIN_ACK, DC_DDBGMODOUT_ACK, DC_INTPOL,
> > > > + /* DC_INTENABLE */
> > > > + DC_IEPRXTX_7, DC_IEPRXTX_6, DC_IEPRXTX_5, DC_IEPRXTX_4, DC_IEPRXTX_3,
> > > > + DC_IEPRXTX_2, DC_IEPRXTX_1, DC_IEPRXTX_0,
> > > > + DC_IEP0SETUP, DC_IEVBUS, DC_IEHS_STA, DC_IERESM, DC_IESUSP, DC_IEBRST,
> > > > + /* DC_EPINDEX */
> > > > + DC_EP0SETUP, DC_ENDPIDX, DC_EPDIR,
> > > > + /* DC_CTRLFUNC */
> > > > + DC_CLBUF, DC_VENDP, DC_DSEN, DC_STATUS, DC_STALL,
> > > > + /* DC_BUFLEN */
> > > > + DC_BUFLEN,
> > > > + /* DC_EPMAXPKTSZ */
> > > > + DC_FFOSZ,
> > > > + /* DC_EPTYPE */
> > > > + DC_EPENABLE, DC_ENDPTYP,
> > > > + /* DC_FRAMENUM */
> > > > + DC_FRAMENUM, DC_UFRAMENUM,
> > > > + /* HW_OTG_CTRL_SET */
> > > > + HW_OTG_DISABLE, HW_SW_SEL_HC_DC, HW_VBUS_DRV, HW_SEL_CP_EXT,
> > > > + HW_DM_PULLDOWN, HW_DP_PULLDOWN, HW_DP_PULLUP,
> > > > + /* HW_OTG_CTRL_CLR */
> > > > + HW_OTG_DISABLE_CLEAR, HW_SW_SEL_HC_DC_CLEAR, HW_VBUS_DRV_CLEAR,
> > > > + HW_SEL_CP_EXT_CLEAR, HW_DM_PULLDOWN_CLEAR, HW_DP_PULLDOWN_CLEAR,
> > > > + HW_DP_PULLUP_CLEAR,
> > > > + /* Last element */
> > > > + DC_FIELD_MAX,
> > > > +};
> > > > +
> > > > +static const struct reg_field isp1761_dc_reg_fields[] = {
> > > > + [DC_DEVEN] = REG_FIELD(ISP176x_DC_ADDRESS, 7, 7),
> > > > + [DC_DEVADDR] = REG_FIELD(ISP176x_DC_ADDRESS, 0, 6),
> > > > + [DC_VBUSSTAT] = REG_FIELD(ISP176x_DC_MODE, 8, 8),
> > > > + [DC_SFRESET] = REG_FIELD(ISP176x_DC_MODE, 4, 4),
> > > > + [DC_GLINTENA] = REG_FIELD(ISP176x_DC_MODE, 3, 3),
> > > > + [DC_CDBGMOD_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 6, 6),
> > > > + [DC_DDBGMODIN_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 4, 4),
> > > > + [DC_DDBGMODOUT_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 2, 2),
> > > > + [DC_INTPOL] = REG_FIELD(ISP176x_DC_INTCONF, 0, 0),
> > > > + [DC_IEPRXTX_7] = REG_FIELD(ISP176x_DC_INTENABLE, 25, 25),
> > > > + [DC_IEPRXTX_6] = REG_FIELD(ISP176x_DC_INTENABLE, 23, 23),
> > > > + [DC_IEPRXTX_5] = REG_FIELD(ISP176x_DC_INTENABLE, 21, 21),
> > > > + [DC_IEPRXTX_4] = REG_FIELD(ISP176x_DC_INTENABLE, 19, 19),
> > > > + [DC_IEPRXTX_3] = REG_FIELD(ISP176x_DC_INTENABLE, 17, 17),
> > > > + [DC_IEPRXTX_2] = REG_FIELD(ISP176x_DC_INTENABLE, 15, 15),
> > > > + [DC_IEPRXTX_1] = REG_FIELD(ISP176x_DC_INTENABLE, 13, 13),
> > > > + [DC_IEPRXTX_0] = REG_FIELD(ISP176x_DC_INTENABLE, 11, 11),
> > > > + [DC_IEP0SETUP] = REG_FIELD(ISP176x_DC_INTENABLE, 8, 8),
> > > > + [DC_IEVBUS] = REG_FIELD(ISP176x_DC_INTENABLE, 7, 7),
> > > > + [DC_IEHS_STA] = REG_FIELD(ISP176x_DC_INTENABLE, 5, 5),
> > > > + [DC_IERESM] = REG_FIELD(ISP176x_DC_INTENABLE, 4, 4),
> > > > + [DC_IESUSP] = REG_FIELD(ISP176x_DC_INTENABLE, 3, 3),
> > > > + [DC_IEBRST] = REG_FIELD(ISP176x_DC_INTENABLE, 0, 0),
> > > > + [DC_EP0SETUP] = REG_FIELD(ISP176x_DC_EPINDEX, 5, 5),
> > > > + [DC_ENDPIDX] = REG_FIELD(ISP176x_DC_EPINDEX, 1, 4),
> > > > + [DC_EPDIR] = REG_FIELD(ISP176x_DC_EPINDEX, 0, 0),
> > > > + [DC_CLBUF] = REG_FIELD(ISP176x_DC_CTRLFUNC, 4, 4),
> > > > + [DC_VENDP] = REG_FIELD(ISP176x_DC_CTRLFUNC, 3, 3),
> > > > + [DC_DSEN] = REG_FIELD(ISP176x_DC_CTRLFUNC, 2, 2),
> > > > + [DC_STATUS] = REG_FIELD(ISP176x_DC_CTRLFUNC, 1, 1),
> > > > + [DC_STALL] = REG_FIELD(ISP176x_DC_CTRLFUNC, 0, 0),
> > > > + [DC_BUFLEN] = REG_FIELD(ISP176x_DC_BUFLEN, 0, 15),
> > > > + [DC_FFOSZ] = REG_FIELD(ISP176x_DC_EPMAXPKTSZ, 0, 10),
> > > > + [DC_EPENABLE] = REG_FIELD(ISP176x_DC_EPTYPE, 3, 3),
> > > > + [DC_ENDPTYP] = REG_FIELD(ISP176x_DC_EPTYPE, 0, 1),
> > > > + [DC_UFRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 11, 13),
> > > > + [DC_FRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 0, 10),
> > > > + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 10, 10),
> > > > + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 7, 7),
> > > > + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 4, 4),
> > > > + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 3, 3),
> > > > + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 2, 2),
> > > > + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 1, 1),
> > > > + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 0, 0),
> > > > + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 10, 10),
> > > > + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 7, 7),
> > > > + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 4, 4),
> > > > + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 3, 3),
> > > > + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 2, 2),
> > > > + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 1, 1),
> > > > + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 0, 0),
> > > > +};
> > > >
> > > > #endif
> > > > diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
> > > > index 1714b2258b54..1ce21ef291b6 100644
> > > > --- a/drivers/usb/isp1760/isp1760-udc.c
> > > > +++ b/drivers/usb/isp1760/isp1760-udc.c
> > > > @@ -45,16 +45,62 @@ static inline struct isp1760_request *req_to_udc_req(struct usb_request *req)
> > > > return container_of(req, struct isp1760_request, req);
> > > > }
> > > >
> > > > -static inline u32 isp1760_udc_read(struct isp1760_udc *udc, u16 reg)
> > > > +static u32 isp1760_udc_read(struct isp1760_udc *udc, u16 field)
> > > > {
> > > > - return isp1760_read32(udc->regs, reg);
> > > > + return isp1760_field_read(udc->fields, field);
> > > > }
> > > >
> > > > -static inline void isp1760_udc_write(struct isp1760_udc *udc, u16 reg, u32 val)
> > > > +static void isp1760_udc_write(struct isp1760_udc *udc, u16 field, u32 val)
> > > > {
> > > > - isp1760_write32(udc->regs, reg, val);
> > > > + isp1760_field_write(udc->fields, field, val);
> > > > }
> > > >
> > > > +static u32 isp1760_udc_read_raw(struct isp1760_udc *udc, u16 reg)
> > > > +{
> > > > + u32 val;
> > > > +
> > > > + regmap_raw_read(udc->regs, reg, &val, 4);
> > > > +
> > > > + return le32_to_cpu(val);
> > > > +}
> > > > +
> > > > +static u16 isp1760_udc_read_raw16(struct isp1760_udc *udc, u16 reg)
> > > > +{
> > > > + u16 val;
> > > > +
> > > > + regmap_raw_read(udc->regs, reg, &val, 2);
> > > > +
> > > > + return le16_to_cpu(val);
> > > > +}
> > > > +
> > > > +static void isp1760_udc_write_raw(struct isp1760_udc *udc, u16 reg, u32 val)
> > > > +{
> > > > + val = cpu_to_le32(val);
> > > > +
> > > > + regmap_raw_write(udc->regs, reg, &val, 4);
> > > > +}
> > > > +
> > > > +static void isp1760_udc_write_raw16(struct isp1760_udc *udc, u16 reg, u16 val)
> > > > +{
> > > > + val = cpu_to_le16(val);
> > > > +
> > > > + regmap_raw_write(udc->regs, reg, &val, 2);
> > > > +}
> > > > +
> > > > +static void isp1760_udc_set(struct isp1760_udc *udc, u32 field)
> > > > +{
> > > > + isp1760_udc_write(udc, field, 0xFFFFFFFF);
> > > > +}
> > > > +
> > > > +static void isp1760_udc_clear(struct isp1760_udc *udc, u32 field)
> > > > +{
> > > > + isp1760_udc_write(udc, field, 0);
> > > > +}
> > > > +
> > > > +static bool isp1760_udc_is_set(struct isp1760_udc *udc, u32 field)
> > > > +{
> > > > + return !!isp1760_udc_read(udc, field);
> > > > +}
> > > > /* -----------------------------------------------------------------------------
> > > > * Endpoint Management
> > > > */
> > > > @@ -75,11 +121,15 @@ static struct isp1760_ep *isp1760_udc_find_ep(struct isp1760_udc *udc,
> > > > return NULL;
> > > > }
> > > >
> > > > -static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> > > > +static void __isp1760_udc_select_ep(struct isp1760_udc *udc,
> > > > + struct isp1760_ep *ep, int dir)
> > > > {
> > > > - isp1760_udc_write(ep->udc, DC_EPINDEX,
> > > > - DC_ENDPIDX(ep->addr & USB_ENDPOINT_NUMBER_MASK) |
> > > > - (dir == USB_DIR_IN ? DC_EPDIR : 0));
> > > > + isp1760_udc_write(udc, DC_ENDPIDX, ep->addr & USB_ENDPOINT_NUMBER_MASK);
> > > > +
> > > > + if (dir == USB_DIR_IN)
> > > > + isp1760_udc_set(udc, DC_EPDIR);
> > > > + else
> > > > + isp1760_udc_clear(udc, DC_EPDIR);
> > > > }
> > > >
> > > > /**
> > > > @@ -93,9 +143,10 @@ static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> > > > *
> > > > * Called with the UDC spinlock held.
> > > > */
> > > > -static void isp1760_udc_select_ep(struct isp1760_ep *ep)
> > > > +static void isp1760_udc_select_ep(struct isp1760_udc *udc,
> > > > + struct isp1760_ep *ep)
> > > > {
> > > > - __isp1760_udc_select_ep(ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> > > > + __isp1760_udc_select_ep(udc, ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> > > > }
> > > >
> > > > /* Called with the UDC spinlock held. */
> > > > @@ -108,9 +159,13 @@ static void isp1760_udc_ctrl_send_status(struct isp1760_ep *ep, int dir)
> > > > * the direction opposite to the data stage data packets, we thus need
> > > > * to select the OUT/IN endpoint for IN/OUT transfers.
> > > > */
> > > > - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) |
> > > > - (dir == USB_DIR_IN ? 0 : DC_EPDIR));
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STATUS);
> > > > + if (dir == USB_DIR_IN)
> > > > + isp1760_udc_clear(udc, DC_EPDIR);
> > > > + else
> > > > + isp1760_udc_set(udc, DC_EPDIR);
> > > > +
> > > > + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> > > > + isp1760_udc_set(udc, DC_STATUS);
> > > >
> > > > /*
> > > > * The hardware will terminate the request automatically and go back to
> > > > @@ -157,10 +212,10 @@ static void isp1760_udc_ctrl_send_stall(struct isp1760_ep *ep)
> > > > spin_lock_irqsave(&udc->lock, flags);
> > > >
> > > > /* Stall both the IN and OUT endpoints. */
> > > > - __isp1760_udc_select_ep(ep, USB_DIR_OUT);
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> > > > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> > > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_OUT);
> > > > + isp1760_udc_set(udc, DC_STALL);
> > > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > > > + isp1760_udc_set(udc, DC_STALL);
> > > >
> > > > /* A protocol stall completes the control transaction. */
> > > > udc->ep0_state = ISP1760_CTRL_SETUP;
> > > > @@ -181,8 +236,8 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > > > u32 *buf;
> > > > int i;
> > > >
> > > > - isp1760_udc_select_ep(ep);
> > > > - len = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> > > > + isp1760_udc_select_ep(udc, ep);
> > > > + len = isp1760_udc_read(udc, DC_BUFLEN);
> > > >
> > > > dev_dbg(udc->isp->dev, "%s: received %u bytes (%u/%u done)\n",
> > > > __func__, len, req->req.actual, req->req.length);
> > > > @@ -198,7 +253,7 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > > > * datasheet doesn't clearly document how this should be
> > > > * handled.
> > > > */
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > > > + isp1760_udc_set(udc, DC_CLBUF);
> > > > return false;
> > > > }
> > > >
> > > > @@ -209,9 +264,9 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > > > * the next packet might be removed from the FIFO.
> > > > */
> > > > for (i = len; i > 2; i -= 4, ++buf)
> > > > - *buf = le32_to_cpu(isp1760_udc_read(udc, DC_DATAPORT));
> > > > + *buf = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > > > if (i > 0)
> > > > - *(u16 *)buf = le16_to_cpu(readw(udc->regs + DC_DATAPORT));
> > > > + *(u16 *)buf = isp1760_udc_read_raw16(udc, ISP176x_DC_DATAPORT);
> > > >
> > > > req->req.actual += len;
> > > >
> > > > @@ -253,7 +308,7 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> > > > __func__, req->packet_size, req->req.actual,
> > > > req->req.length);
> > > >
> > > > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > > >
> > > > if (req->packet_size)
> > > > isp1760_udc_write(udc, DC_BUFLEN, req->packet_size);
> > > > @@ -265,14 +320,14 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> > > > * the FIFO for this kind of conditions, but doesn't seem to work.
> > > > */
> > > > for (i = req->packet_size; i > 2; i -= 4, ++buf)
> > > > - isp1760_udc_write(udc, DC_DATAPORT, cpu_to_le32(*buf));
> > > > + isp1760_udc_write_raw(udc, ISP176x_DC_DATAPORT, *buf);
> > > > if (i > 0)
> > > > - writew(cpu_to_le16(*(u16 *)buf), udc->regs + DC_DATAPORT);
> > > > + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, *(u16 *)buf);
> > > >
> > > > if (ep->addr == 0)
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > > > + isp1760_udc_set(udc, DC_DSEN);
> > > > if (!req->packet_size)
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_VENDP);
> > > > + isp1760_udc_set(udc, DC_VENDP);
> > > > }
> > > >
> > > > static void isp1760_ep_rx_ready(struct isp1760_ep *ep)
> > > > @@ -408,19 +463,24 @@ static int __isp1760_udc_set_halt(struct isp1760_ep *ep, bool halt)
> > > > return -EINVAL;
> > > > }
> > > >
> > > > - isp1760_udc_select_ep(ep);
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> > > > + isp1760_udc_select_ep(udc, ep);
> > > > +
> > > > + if (halt)
> > > > + isp1760_udc_set(udc, DC_STALL);
> > > > + else
> > > > + isp1760_udc_clear(udc, DC_STALL);
> > > >
> > > > if (ep->addr == 0) {
> > > > /* When halting the control endpoint, stall both IN and OUT. */
> > > > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> > > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > > > + if (halt)
> > > > + isp1760_udc_set(udc, DC_STALL);
> > > > + else
> > > > + isp1760_udc_clear(udc, DC_STALL);
> > > > } else if (!halt) {
> > > > /* Reset the data PID by cycling the endpoint enable bit. */
> > > > - u16 eptype = isp1760_udc_read(udc, DC_EPTYPE);
> > > > -
> > > > - isp1760_udc_write(udc, DC_EPTYPE, eptype & ~DC_EPENABLE);
> > > > - isp1760_udc_write(udc, DC_EPTYPE, eptype);
> > > > + isp1760_udc_clear(udc, DC_EPENABLE);
> > > > + isp1760_udc_set(udc, DC_EPENABLE);
> > > >
> > > > /*
> > > > * Disabling the endpoint emptied the transmit FIFO, fill it
> > > > @@ -479,12 +539,14 @@ static int isp1760_udc_get_status(struct isp1760_udc *udc,
> > > > return -EINVAL;
> > > > }
> > > >
> > > > - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) | DC_EPDIR);
> > > > + isp1760_udc_set(udc, DC_EPDIR);
> > > > + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> > > > +
> > > > isp1760_udc_write(udc, DC_BUFLEN, 2);
> > > >
> > > > - writew(cpu_to_le16(status), udc->regs + DC_DATAPORT);
> > > > + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, status);
> > > >
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > > > + isp1760_udc_set(udc, DC_DSEN);
> > > >
> > > > dev_dbg(udc->isp->dev, "%s: status 0x%04x\n", __func__, status);
> > > >
> > > > @@ -508,7 +570,8 @@ static int isp1760_udc_set_address(struct isp1760_udc *udc, u16 addr)
> > > > usb_gadget_set_state(&udc->gadget, addr ? USB_STATE_ADDRESS :
> > > > USB_STATE_DEFAULT);
> > > >
> > > > - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN | addr);
> > > > + isp1760_udc_write(udc, DC_DEVADDR, addr);
> > > > + isp1760_udc_set(udc, DC_DEVEN);
> > > >
> > > > spin_lock(&udc->lock);
> > > > isp1760_udc_ctrl_send_status(&udc->ep[0], USB_DIR_OUT);
> > > > @@ -650,9 +713,9 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
> > > >
> > > > spin_lock(&udc->lock);
> > > >
> > > > - isp1760_udc_write(udc, DC_EPINDEX, DC_EP0SETUP);
> > > > + isp1760_udc_set(udc, DC_EP0SETUP);
> > > >
> > > > - count = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> > > > + count = isp1760_udc_read(udc, DC_BUFLEN);
> > > > if (count != sizeof(req)) {
> > > > spin_unlock(&udc->lock);
> > > >
> > > > @@ -663,8 +726,8 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
> > > > return;
> > > > }
> > > >
> > > > - req.data[0] = isp1760_udc_read(udc, DC_DATAPORT);
> > > > - req.data[1] = isp1760_udc_read(udc, DC_DATAPORT);
> > > > + req.data[0] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > > > + req.data[1] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > > >
> > > > if (udc->ep0_state != ISP1760_CTRL_SETUP) {
> > > > spin_unlock(&udc->lock);
> > > > @@ -732,13 +795,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
> > > >
> > > > switch (usb_endpoint_type(desc)) {
> > > > case USB_ENDPOINT_XFER_ISOC:
> > > > - type = DC_ENDPTYP_ISOC;
> > > > + type = ISP176x_DC_ENDPTYP_ISOC;
> > > > break;
> > > > case USB_ENDPOINT_XFER_BULK:
> > > > - type = DC_ENDPTYP_BULK;
> > > > + type = ISP176x_DC_ENDPTYP_BULK;
> > > > break;
> > > > case USB_ENDPOINT_XFER_INT:
> > > > - type = DC_ENDPTYP_INTERRUPT;
> > > > + type = ISP176x_DC_ENDPTYP_INTERRUPT;
> > > > break;
> > > > case USB_ENDPOINT_XFER_CONTROL:
> > > > default:
> > > > @@ -755,10 +818,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
> > > > uep->halted = false;
> > > > uep->wedged = false;
> > > >
> > > > - isp1760_udc_select_ep(uep);
> > > > - isp1760_udc_write(udc, DC_EPMAXPKTSZ, uep->maxpacket);
> > > > + isp1760_udc_select_ep(udc, uep);
> > > > +
> > > > + isp1760_udc_write(udc, DC_FFOSZ, uep->maxpacket);
> > > > isp1760_udc_write(udc, DC_BUFLEN, uep->maxpacket);
> > > > - isp1760_udc_write(udc, DC_EPTYPE, DC_EPENABLE | type);
> > > > +
> > > > + isp1760_udc_write(udc, DC_ENDPTYP, type);
> > > > + isp1760_udc_set(udc, DC_EPENABLE);
> > > >
> > > > spin_unlock_irqrestore(&udc->lock, flags);
> > > >
> > > > @@ -786,8 +852,9 @@ static int isp1760_ep_disable(struct usb_ep *ep)
> > > > uep->desc = NULL;
> > > > uep->maxpacket = 0;
> > > >
> > > > - isp1760_udc_select_ep(uep);
> > > > - isp1760_udc_write(udc, DC_EPTYPE, 0);
> > > > + isp1760_udc_select_ep(udc, uep);
> > > > + isp1760_udc_clear(udc, DC_EPENABLE);
> > > > + isp1760_udc_clear(udc, DC_ENDPTYP);
> > > >
> > > > /* TODO Synchronize with the IRQ handler */
> > > >
> > > > @@ -864,8 +931,8 @@ static int isp1760_ep_queue(struct usb_ep *ep, struct usb_request *_req,
> > > >
> > > > case ISP1760_CTRL_DATA_OUT:
> > > > list_add_tail(&req->queue, &uep->queue);
> > > > - __isp1760_udc_select_ep(uep, USB_DIR_OUT);
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > > > + __isp1760_udc_select_ep(udc, uep, USB_DIR_OUT);
> > > > + isp1760_udc_set(udc, DC_DSEN);
> > > > break;
> > > >
> > > > case ISP1760_CTRL_STATUS:
> > > > @@ -1025,14 +1092,14 @@ static void isp1760_ep_fifo_flush(struct usb_ep *ep)
> > > >
> > > > spin_lock_irqsave(&udc->lock, flags);
> > > >
> > > > - isp1760_udc_select_ep(uep);
> > > > + isp1760_udc_select_ep(udc, uep);
> > > >
> > > > /*
> > > > * Set the CLBUF bit twice to flush both buffers in case double
> > > > * buffering is enabled.
> > > > */
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > > > + isp1760_udc_set(udc, DC_CLBUF);
> > > > + isp1760_udc_set(udc, DC_CLBUF);
> > > >
> > > > spin_unlock_irqrestore(&udc->lock, flags);
> > > > }
> > > > @@ -1091,19 +1158,30 @@ static void isp1760_udc_init_hw(struct isp1760_udc *udc)
> > > > * ACK tokens only (and NYET for the out pipe). The default
> > > > * configuration also generates an interrupt on the first NACK token.
> > > > */
> > > > - isp1760_udc_write(udc, DC_INTCONF, DC_CDBGMOD_ACK | DC_DDBGMODIN_ACK |
> > > > - DC_DDBGMODOUT_ACK_NYET);
> > > > -
> > > > - isp1760_udc_write(udc, DC_INTENABLE, DC_IEPRXTX(7) | DC_IEPRXTX(6) |
> > > > - DC_IEPRXTX(5) | DC_IEPRXTX(4) | DC_IEPRXTX(3) |
> > > > - DC_IEPRXTX(2) | DC_IEPRXTX(1) | DC_IEPRXTX(0) |
> > > > - DC_IEP0SETUP | DC_IEVBUS | DC_IERESM | DC_IESUSP |
> > > > - DC_IEHS_STA | DC_IEBRST);
> > > > + isp1760_udc_set(udc, DC_CDBGMOD_ACK);
> > > > + isp1760_udc_set(udc, DC_DDBGMODIN_ACK);
> > > > + isp1760_udc_set(udc, DC_DDBGMODOUT_ACK);
> > > > +
> > > > + isp1760_udc_set(udc, DC_IEPRXTX_7);
> > > > + isp1760_udc_set(udc, DC_IEPRXTX_6);
> > > > + isp1760_udc_set(udc, DC_IEPRXTX_5);
> > > > + isp1760_udc_set(udc, DC_IEPRXTX_4);
> > > > + isp1760_udc_set(udc, DC_IEPRXTX_3);
> > > > + isp1760_udc_set(udc, DC_IEPRXTX_2);
> > > > + isp1760_udc_set(udc, DC_IEPRXTX_1);
> > > > + isp1760_udc_set(udc, DC_IEPRXTX_0);
> > > > +
> > > > + isp1760_udc_set(udc, DC_IEP0SETUP);
> > > > + isp1760_udc_set(udc, DC_IEVBUS);
> > > > + isp1760_udc_set(udc, DC_IERESM);
> > > > + isp1760_udc_set(udc, DC_IESUSP);
> > > > + isp1760_udc_set(udc, DC_IEHS_STA);
> > > > + isp1760_udc_set(udc, DC_IEBRST);
> > > >
> > > > if (udc->connected)
> > > > isp1760_set_pullup(udc->isp, true);
> > > >
> > > > - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN);
> > > > + isp1760_udc_set(udc, DC_DEVEN);
> > > > }
> > > >
> > > > static void isp1760_udc_reset(struct isp1760_udc *udc)
> > > > @@ -1152,7 +1230,7 @@ static int isp1760_udc_get_frame(struct usb_gadget *gadget)
> > > > {
> > > > struct isp1760_udc *udc = gadget_to_udc(gadget);
> > > >
> > > > - return isp1760_udc_read(udc, DC_FRAMENUM) & ((1 << 11) - 1);
> > > > + return isp1760_udc_read(udc, DC_FRAMENUM);
> > > > }
> > > >
> > > > static int isp1760_udc_wakeup(struct usb_gadget *gadget)
> > > > @@ -1219,7 +1297,7 @@ static int isp1760_udc_start(struct usb_gadget *gadget,
> > > > usb_gadget_set_state(&udc->gadget, USB_STATE_ATTACHED);
> > > >
> > > > /* DMA isn't supported yet, don't enable the DMA clock. */
> > > > - isp1760_udc_write(udc, DC_MODE, DC_GLINTENA);
> > > > + isp1760_udc_set(udc, DC_GLINTENA);
> > > >
> > > > isp1760_udc_init_hw(udc);
> > > >
> > > > @@ -1238,7 +1316,7 @@ static int isp1760_udc_stop(struct usb_gadget *gadget)
> > > >
> > > > del_timer_sync(&udc->vbus_timer);
> > > >
> > > > - isp1760_udc_write(udc, DC_MODE, 0);
> > > > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > > >
> > > > spin_lock_irqsave(&udc->lock, flags);
> > > > udc->driver = NULL;
> > > > @@ -1266,9 +1344,9 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> > > > unsigned int i;
> > > > u32 status;
> > > >
> > > > - status = isp1760_udc_read(udc, DC_INTERRUPT)
> > > > - & isp1760_udc_read(udc, DC_INTENABLE);
> > > > - isp1760_udc_write(udc, DC_INTERRUPT, status);
> > > > + status = isp1760_reg_read(udc->regs, ISP176x_DC_INTERRUPT)
> > > > + & isp1760_reg_read(udc->regs, ISP176x_DC_INTENABLE);
> > > > + isp1760_reg_write(udc->regs, ISP176x_DC_INTERRUPT, status);
> > > >
> > > > if (status & DC_IEVBUS) {
> > > > dev_dbg(udc->isp->dev, "%s(VBUS)\n", __func__);
> > > > @@ -1313,7 +1391,7 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> > > > dev_dbg(udc->isp->dev, "%s(SUSP)\n", __func__);
> > > >
> > > > spin_lock(&udc->lock);
> > > > - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> > > > + if (!isp1760_udc_is_set(udc, DC_VBUSSTAT))
> > > > isp1760_udc_disconnect(udc);
> > > > else
> > > > isp1760_udc_suspend(udc);
> > > > @@ -1335,7 +1413,7 @@ static void isp1760_udc_vbus_poll(struct timer_list *t)
> > > >
> > > > spin_lock_irqsave(&udc->lock, flags);
> > > >
> > > > - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> > > > + if (!(isp1760_udc_is_set(udc, DC_VBUSSTAT)))
> > > > isp1760_udc_disconnect(udc);
> > > > else if (udc->gadget.state >= USB_STATE_POWERED)
> > > > mod_timer(&udc->vbus_timer,
> > > > @@ -1412,9 +1490,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> > > > * register, and reading the scratch register value back. The chip ID
> > > > * and scratch register contents must match the expected values.
> > > > */
> > > > - isp1760_udc_write(udc, DC_SCRATCH, 0xbabe);
> > > > - chipid = isp1760_udc_read(udc, DC_CHIPID);
> > > > - scratch = isp1760_udc_read(udc, DC_SCRATCH);
> > > > + isp1760_reg_write(udc->regs, ISP176x_DC_SCRATCH, 0xbabe);
> > > > + chipid = isp1760_reg_read(udc->regs, ISP176x_DC_CHIPID);
> > > > + scratch = isp1760_reg_read(udc->regs, ISP176x_DC_SCRATCH);
> > > >
> > > > if (scratch != 0xbabe) {
> > > > dev_err(udc->isp->dev,
> > > > @@ -1429,9 +1507,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> > > > }
> > > >
> > > > /* Reset the device controller. */
> > > > - isp1760_udc_write(udc, DC_MODE, DC_SFRESET);
> > > > + isp1760_udc_set(udc, DC_SFRESET);
> > > > usleep_range(10000, 11000);
> > > > - isp1760_udc_write(udc, DC_MODE, 0);
> > > > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > > > usleep_range(10000, 11000);
> > > >
> > > > return 0;
> > > > @@ -1445,7 +1523,6 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq,
> > > >
> > > > udc->irq = -1;
> > > > udc->isp = isp;
> > > > - udc->regs = isp->regs;
> > > >
> > > > spin_lock_init(&udc->lock);
> > > > timer_setup(&udc->vbus_timer, isp1760_udc_vbus_poll, 0);
> > > > diff --git a/drivers/usb/isp1760/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
> > > > index d2df650d54e9..a49096c0ac8e 100644
> > > > --- a/drivers/usb/isp1760/isp1760-udc.h
> > > > +++ b/drivers/usb/isp1760/isp1760-udc.h
> > > > @@ -17,6 +17,8 @@
> > > > #include <linux/timer.h>
> > > > #include <linux/usb/gadget.h>
> > > >
> > > > +#include "isp1760-regs.h"
> > >
> > > Is this needed ?
> >
> > for DC_FIELD_MAX below, right?
> >
> > Cheers,
> > Rui
> > >
> > > > +
> > > > struct isp1760_device;
> > > > struct isp1760_udc;
> > > >
> > > > @@ -48,7 +50,7 @@ struct isp1760_ep {
> > > > * struct isp1760_udc - UDC state information
> > > > * irq: IRQ number
> > > > * irqname: IRQ name (as passed to request_irq)
> > > > - * regs: Base address of the UDC registers
> > > > + * regs: regmap for UDC registers
> > > > * driver: Gadget driver
> > > > * gadget: Gadget device
> > > > * lock: Protects driver, vbus_timer, ep, ep0_*, DC_EPINDEX register
> > > > @@ -59,12 +61,13 @@ struct isp1760_ep {
> > > > * connected: Tracks gadget driver bus connection state
> > > > */
> > > > struct isp1760_udc {
> > > > -#ifdef CONFIG_USB_ISP1761_UDC
> > > > struct isp1760_device *isp;
> > > >
> > > > int irq;
> > > > char *irqname;
> > > > - void __iomem *regs;
> > > > +
> > > > + struct regmap *regs;
> > > > + struct regmap_field *fields[DC_FIELD_MAX];
> > > >
> > > > struct usb_gadget_driver *driver;
> > > > struct usb_gadget gadget;
> > > > @@ -81,7 +84,6 @@ struct isp1760_udc {
> > > > bool connected;
> > > >
> > > > unsigned int devstatus;
> > > > -#endif
> > > > };
> > > >
> > > > #ifdef CONFIG_USB_ISP1761_UDC
>
> --
> Regards,
>
> Laurent Pinchart
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 1/7] usb: isp1760: move to regmap for register access
2021-05-06 14:14 ` Rui Miguel Silva
@ 2021-05-06 14:59 ` Laurent Pinchart
2021-05-06 15:59 ` Rui Miguel Silva
0 siblings, 1 reply; 25+ messages in thread
From: Laurent Pinchart @ 2021-05-06 14:59 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: Greg Kroah-Hartman, Sebastian Siewior, Rob Herring, linux-usb,
devicetree
Hi Rui,
On Thu, May 06, 2021 at 03:14:15PM +0100, Rui Miguel Silva wrote:
> On Thu May 6, 2021 at 2:45 PM WEST, Laurent Pinchart wrote:
> > On Thu, May 06, 2021 at 02:39:13PM +0100, Rui Miguel Silva wrote:
> > > On Thu May 6, 2021 at 1:24 PM WEST, Laurent Pinchart wrote:
> > > > On Tue, May 04, 2021 at 11:19:04AM +0100, Rui Miguel Silva wrote:
> > > > > Rework access to registers and memory to use regmap framework.
> > > > > No change in current feature or way of work is intended with this
> > > > > change.
> > > > >
> > > > > This will allow to reuse this driver with other IP of this family,
> > > > > for example isp1763, with little changes and effort.
> > > > >
> > > > > Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
> > > > > ---
> > > > > drivers/usb/isp1760/isp1760-core.c | 123 +++++---
> > > > > drivers/usb/isp1760/isp1760-core.h | 38 ++-
> > > > > drivers/usb/isp1760/isp1760-hcd.c | 436 ++++++++++++++--------------
> > > > > drivers/usb/isp1760/isp1760-hcd.h | 18 +-
> > > > > drivers/usb/isp1760/isp1760-if.c | 4 +-
> > > > > drivers/usb/isp1760/isp1760-regs.h | 442 +++++++++++++++++------------
> > > > > drivers/usb/isp1760/isp1760-udc.c | 235 +++++++++------
> > > > > drivers/usb/isp1760/isp1760-udc.h | 10 +-
> > > > > 8 files changed, 779 insertions(+), 527 deletions(-)
> > > > >
> > > > > diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
> > > > > index fdeb4cf97cc5..f78e637d3b9a 100644
> > > > > --- a/drivers/usb/isp1760/isp1760-core.c
> > > > > +++ b/drivers/usb/isp1760/isp1760-core.c
> > > > > @@ -25,8 +25,8 @@
> > > > >
> > > > > static void isp1760_init_core(struct isp1760_device *isp)
> > > > > {
> > > > > - u32 otgctrl;
> > > > > - u32 hwmode;
> > > > > + struct isp1760_hcd *hcd = &isp->hcd;
> > > > > + struct isp1760_udc *udc = &isp->udc;
> > > > >
> > > > > /* Low-level chip reset */
> > > > > if (isp->rst_gpio) {
> > > > > @@ -39,24 +39,22 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > > > * Reset the host controller, including the CPU interface
> > > > > * configuration.
> > > > > */
> > > > > - isp1760_write32(isp->regs, HC_RESET_REG, SW_RESET_RESET_ALL);
> > > > > + isp1760_field_set(hcd->fields, SW_RESET_RESET_ALL);
> > > > > msleep(100);
> > > > >
> > > > > /* Setup HW Mode Control: This assumes a level active-low interrupt */
> > > > > - hwmode = HW_DATA_BUS_32BIT;
> > > > > -
> > > > > if (isp->devflags & ISP1760_FLAG_BUS_WIDTH_16)
> > > > > - hwmode &= ~HW_DATA_BUS_32BIT;
> > > > > + isp1760_field_clear(hcd->fields, HW_DATA_BUS_WIDTH);
> > > > > if (isp->devflags & ISP1760_FLAG_ANALOG_OC)
> > > > > - hwmode |= HW_ANA_DIGI_OC;
> > > > > + isp1760_field_set(hcd->fields, HW_ANA_DIGI_OC);
> > > > > if (isp->devflags & ISP1760_FLAG_DACK_POL_HIGH)
> > > > > - hwmode |= HW_DACK_POL_HIGH;
> > > > > + isp1760_field_set(hcd->fields, HW_DACK_POL_HIGH);
> > > > > if (isp->devflags & ISP1760_FLAG_DREQ_POL_HIGH)
> > > > > - hwmode |= HW_DREQ_POL_HIGH;
> > > > > + isp1760_field_set(hcd->fields, HW_DREQ_POL_HIGH);
> > > > > if (isp->devflags & ISP1760_FLAG_INTR_POL_HIGH)
> > > > > - hwmode |= HW_INTR_HIGH_ACT;
> > > > > + isp1760_field_set(hcd->fields, HW_INTR_HIGH_ACT);
> > > > > if (isp->devflags & ISP1760_FLAG_INTR_EDGE_TRIG)
> > > > > - hwmode |= HW_INTR_EDGE_TRIG;
> > > > > + isp1760_field_set(hcd->fields, HW_INTR_EDGE_TRIG);
> > > >
> > > > This makes a difference, as you're now writing the register for every
> > > > bit. It can have a performance impact (although that should be small,
> > >
> > > This is in initialization time, so I am not expecting this to have a
> > > major performance impact.
> >
> > This comment applies to the rest of the driver too, not just this
> > location. Sorry for not making that clear.
>
> humm, I will change this one, but I can not really spot any other
> sequence similar that is in an fast path in which the
> read-modify-write would make impact, all access in ptd and mem
> read/write are done with isp1760_reg_{read,write}.
> Even in run time I did not found any issues.
Please see below.
> > > > but still), but also a functional impact. I'd rather keep a single write
> > > > for this kind of sequence, especially when no read-modify-write sequence
> > > > is needed. If you need read-modify-write for the platform you work on,
> > > > switching to such patterns should be done in a patch of its own.
> > >
> > > For me that's ok, I do not have strong feelings about this. I can
> > > change it for isp1760_reg_write at the end.
> >
> > Thanks.
> >
> > > > >
> > > > > /*
> > > > > * The ISP1761 has a dedicated DC IRQ line but supports sharing the HC
> > > > > @@ -65,18 +63,10 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > > > * spurious interrupts during HCD registration.
> > > > > */
> > > > > if (isp->devflags & ISP1760_FLAG_ISP1761) {
> > > > > - isp1760_write32(isp->regs, DC_MODE, 0);
> > > > > - hwmode |= HW_COMN_IRQ;
> > > > > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > > > > + isp1760_field_set(hcd->fields, HW_COMN_IRQ);
> > > > > }
> > > > >
> > > > > - /*
> > > > > - * We have to set this first in case we're in 16-bit mode.
> > > > > - * Write it twice to ensure correct upper bits if switching
> > > > > - * to 16-bit mode.
> > > > > - */
> > > > > - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> > > > > - isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
> > > > > -
> > > > > /*
> > > > > * PORT 1 Control register of the ISP1760 is the OTG control register
> > > > > * on ISP1761.
> > > > > @@ -85,14 +75,15 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > > > * when OTG is requested.
> > > > > */
> > > > > if ((isp->devflags & ISP1760_FLAG_ISP1761) &&
> > > > > - (isp->devflags & ISP1760_FLAG_OTG_EN))
> > > > > - otgctrl = ((HW_DM_PULLDOWN | HW_DP_PULLDOWN) << 16)
> > > > > - | HW_OTG_DISABLE;
> > > > > - else
> > > > > - otgctrl = (HW_SW_SEL_HC_DC << 16)
> > > > > - | (HW_VBUS_DRV | HW_SEL_CP_EXT);
> > > > > -
> > > > > - isp1760_write32(isp->regs, HC_PORT1_CTRL, otgctrl);
> > > > > + (isp->devflags & ISP1760_FLAG_OTG_EN)) {
> > > > > + isp1760_field_set(hcd->fields, HW_DM_PULLDOWN);
> > > > > + isp1760_field_set(hcd->fields, HW_DP_PULLDOWN);
> > > > > + isp1760_field_set(hcd->fields, HW_OTG_DISABLE);
> > > > > + } else {
> > > > > + isp1760_field_set(hcd->fields, HW_SW_SEL_HC_DC);
> > > > > + isp1760_field_set(hcd->fields, HW_VBUS_DRV);
> > > > > + isp1760_field_set(hcd->fields, HW_SEL_CP_EXT);
> > > > > + }
> > > > >
> > > > > dev_info(isp->dev, "bus width: %u, oc: %s\n",
> > > > > isp->devflags & ISP1760_FLAG_BUS_WIDTH_16 ? 16 : 32,
> > > > > @@ -101,16 +92,43 @@ static void isp1760_init_core(struct isp1760_device *isp)
> > > > >
> > > > > void isp1760_set_pullup(struct isp1760_device *isp, bool enable)
> > > > > {
> > > > > - isp1760_write32(isp->regs, HW_OTG_CTRL_SET,
> > > > > - enable ? HW_DP_PULLUP : HW_DP_PULLUP << 16);
> > > > > + struct isp1760_udc *udc = &isp->udc;
> > > > > +
> > > > > + if (enable)
> > > > > + isp1760_field_set(udc->fields, HW_DP_PULLUP);
> > > > > + else
> > > > > + isp1760_field_set(udc->fields, HW_DP_PULLUP_CLEAR);
> > > > > }
> > > > >
> > > > > +static struct regmap_config isp1760_hc_regmap_conf = {
> > > > > + .name = "isp1760-hc",
> > > > > + .reg_bits = 16,
> > > > > + .val_bits = 32,
> > > > > + .fast_io = true,
> > > > > + .max_register = ISP176x_HC_MEMORY,
> > > > > + .volatile_table = &isp176x_hc_volatile_table,
> > > > > +};
> > > > > +
> > > > > +static struct regmap_config isp1761_dc_regmap_conf = {
> > > > > + .name = "isp1761-dc",
> > > > > + .reg_bits = 16,
> > > > > + .val_bits = 32,
> > > > > + .fast_io = true,
> > > > > + .max_register = ISP1761_DC_OTG_CTRL_CLEAR,
> > > > > + .volatile_table = &isp176x_dc_volatile_table,
> > > > > +};
> > > > > +
> > > > > int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > > > > struct device *dev, unsigned int devflags)
> > > > > {
> > > > > struct isp1760_device *isp;
> > > > > + struct isp1760_hcd *hcd;
> > > > > + struct isp1760_udc *udc;
> > > > > bool udc_disabled = !(devflags & ISP1760_FLAG_ISP1761);
> > > > > + struct regmap_field *f;
> > > > > + void __iomem *base;
> > > > > int ret;
> > > > > + int i;
> > > > >
> > > > > /*
> > > > > * If neither the HCD not the UDC is enabled return an error, as no
> > > > > @@ -126,19 +144,52 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > > > >
> > > > > isp->dev = dev;
> > > > > isp->devflags = devflags;
> > > > > + hcd = &isp->hcd;
> > > > > + udc = &isp->udc;
> > > > > +
> > > > > + if (devflags & ISP1760_FLAG_BUS_WIDTH_16) {
> > > > > + isp1760_hc_regmap_conf.val_bits = 16;
> > > > > + isp1761_dc_regmap_conf.val_bits = 16;
> > > > > + }
> > > > >
> > > > > isp->rst_gpio = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);
> > > > > if (IS_ERR(isp->rst_gpio))
> > > > > return PTR_ERR(isp->rst_gpio);
> > > > >
> > > > > - isp->regs = devm_ioremap_resource(dev, mem);
> > > > > - if (IS_ERR(isp->regs))
> > > > > - return PTR_ERR(isp->regs);
> > > > > + hcd->base = devm_ioremap_resource(dev, mem);
> > > > > + if (IS_ERR(hcd->base))
> > > > > + return PTR_ERR(hcd->base);
> > > > > +
> > > > > + hcd->regs = devm_regmap_init_mmio(dev, base, &isp1760_hc_regmap_conf);
> > > > > + if (IS_ERR(hcd->regs))
> > > > > + return PTR_ERR(hcd->regs);
> > > > > +
> > > > > + for (i = 0; i < HC_FIELD_MAX; i++) {
> > > > > + f = devm_regmap_field_alloc(dev, hcd->regs,
> > > > > + isp1760_hc_reg_fields[i]);
> > > > > + if (IS_ERR(f))
> > > > > + return PTR_ERR(f);
> > > > > +
> > > > > + hcd->fields[i] = f;
> > > > > + }
> > > > > +
> > > > > + udc->regs = devm_regmap_init_mmio(dev, base, &isp1761_dc_regmap_conf);
> > > > > + if (IS_ERR(udc->regs))
> > > > > + return PTR_ERR(udc->regs);
> > > > > +
> > > > > + for (i = 0; i < DC_FIELD_MAX; i++) {
> > > > > + f = devm_regmap_field_alloc(dev, udc->regs,
> > > > > + isp1761_dc_reg_fields[i]);
> > > > > + if (IS_ERR(f))
> > > > > + return PTR_ERR(f);
> > > > > +
> > > > > + udc->fields[i] = f;
> > > > > + }
> > > > >
> > > > > isp1760_init_core(isp);
> > > > >
> > > > > if (IS_ENABLED(CONFIG_USB_ISP1760_HCD) && !usb_disabled()) {
> > > > > - ret = isp1760_hcd_register(&isp->hcd, isp->regs, mem, irq,
> > > > > + ret = isp1760_hcd_register(hcd, mem, irq,
> > > > > irqflags | IRQF_SHARED, dev);
> > > > > if (ret < 0)
> > > > > return ret;
> > > > > @@ -147,7 +198,7 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
> > > > > if (IS_ENABLED(CONFIG_USB_ISP1761_UDC) && !udc_disabled) {
> > > > > ret = isp1760_udc_register(isp, irq, irqflags);
> > > > > if (ret < 0) {
> > > > > - isp1760_hcd_unregister(&isp->hcd);
> > > > > + isp1760_hcd_unregister(hcd);
> > > > > return ret;
> > > > > }
> > > > > }
> > > > > diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
> > > > > index d9a0a4cc467c..8fec6395f19f 100644
> > > > > --- a/drivers/usb/isp1760/isp1760-core.h
> > > > > +++ b/drivers/usb/isp1760/isp1760-core.h
> > > > > @@ -14,6 +14,7 @@
> > > > > #define _ISP1760_CORE_H_
> > > > >
> > > > > #include <linux/ioport.h>
> > > > > +#include <linux/regmap.h>
> > > > >
> > > > > #include "isp1760-hcd.h"
> > > > > #include "isp1760-udc.h"
> > > > > @@ -38,7 +39,6 @@ struct gpio_desc;
> > > > > struct isp1760_device {
> > > > > struct device *dev;
> > > > >
> > > > > - void __iomem *regs;
> > > > > unsigned int devflags;
> > > > > struct gpio_desc *rst_gpio;
> > > > >
> > > > > @@ -52,14 +52,42 @@ void isp1760_unregister(struct device *dev);
> > > > >
> > > > > void isp1760_set_pullup(struct isp1760_device *isp, bool enable);
> > > > >
> > > > > -static inline u32 isp1760_read32(void __iomem *base, u32 reg)
> > > > > +static inline u32 isp1760_field_read(struct regmap_field **fields, u32 field)
> > > > > {
> > > > > - return readl(base + reg);
> > > > > + unsigned int val;
> > > > > +
> > > > > + regmap_field_read(fields[field], &val);
> > > > > +
> > > > > + return val;
> > > > > +}
> > > > > +
> > > > > +static inline void isp1760_field_write(struct regmap_field **fields, u32 field,
> > > > > + u32 val)
> > > > > +{
> > > > > + regmap_field_write(fields[field], val);
> > > > > +}
> > > > > +
> > > > > +static inline void isp1760_field_set(struct regmap_field **fields, u32 field)
> > > > > +{
> > > > > + isp1760_field_write(fields, field, 0xFFFFFFFF);
> > > > > }
> > > > >
> > > > > -static inline void isp1760_write32(void __iomem *base, u32 reg, u32 val)
> > > > > +static inline void isp1760_field_clear(struct regmap_field **fields, u32 field)
> > > > > {
> > > > > - writel(val, base + reg);
> > > > > + isp1760_field_write(fields, field, 0);
> > > > > }
> > > > >
> > > > > +static inline u32 isp1760_reg_read(struct regmap *regs, u32 reg)
> > > > > +{
> > > > > + unsigned int val;
> > > > > +
> > > > > + regmap_read(regs, reg, &val);
> > > > > +
> > > > > + return val;
> > > > > +}
> > > > > +
> > > > > +static inline void isp1760_reg_write(struct regmap *regs, u32 reg, u32 val)
> > > > > +{
> > > > > + regmap_write(regs, reg, val);
> > > > > +}
> > > > > #endif
> > > > > diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
> > > > > index 33ae656c4b68..0601b1a4bd42 100644
> > > > > --- a/drivers/usb/isp1760/isp1760-hcd.c
> > > > > +++ b/drivers/usb/isp1760/isp1760-hcd.c
> > > > > @@ -66,6 +66,10 @@ struct ptd {
> > > > > #define ATL_PTD_OFFSET 0x0c00
> > > > > #define PAYLOAD_OFFSET 0x1000
> > > > >
> > > > > +#define ISP_BANK_0 0x00
> > > > > +#define ISP_BANK_1 0x01
> > > > > +#define ISP_BANK_2 0x02
> > > > > +#define ISP_BANK_3 0x03
> > > > >
> > > > > /* ATL */
> > > > > /* DW0 */
> > > > > @@ -159,16 +163,59 @@ struct urb_listitem {
> > > > > };
> > > > >
> > > > > /*
> > > > > - * Access functions for isp176x registers (addresses 0..0x03FF).
> > > > > + * Access functions for isp176x registers regmap fields
> > > > > */
> > > > > -static u32 reg_read32(void __iomem *base, u32 reg)
> > > > > +static u32 isp1760_hcd_read(struct usb_hcd *hcd, u32 field)
> > > > > {
> > > > > - return isp1760_read32(base, reg);
> > > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > +
> > > > > + return isp1760_field_read(priv->fields, field);
> > > > > +}
> > > > > +
> > > > > +static void isp1760_hcd_write(struct usb_hcd *hcd, u32 field, u32 val)
> > > > > +{
> > > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > +
> > > > > + isp1760_field_write(priv->fields, field, val);
> > > > > +}
> > > > > +
> > > > > +static void isp1760_hcd_set(struct usb_hcd *hcd, u32 field)
> > > > > +{
> > > > > + isp1760_hcd_write(hcd, field, 0xFFFFFFFF);
> > > > > +}
> > > > > +
> > > > > +static void isp1760_hcd_clear(struct usb_hcd *hcd, u32 field)
> > > > > +{
> > > > > + isp1760_hcd_write(hcd, field, 0);
> > > > > +}
> > > > > +
> > > > > +static int isp1760_hcd_set_poll_timeout(struct usb_hcd *hcd, u32 field,
> > > > > + u32 timeout_us)
> > > > > +{
> > > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > + unsigned int val;
> > > > > +
> > > > > + isp1760_hcd_set(hcd, field);
> > > > > +
> > > > > + return regmap_field_read_poll_timeout(priv->fields[field], val, 1, 1,
> > > > > + timeout_us);
> > > > > }
> > > > >
> > > > > -static void reg_write32(void __iomem *base, u32 reg, u32 val)
> > > > > +static int isp1760_hcd_clear_poll_timeout(struct usb_hcd *hcd, u32 field,
> > > > > + u32 timeout_us)
> > > > > {
> > > > > - isp1760_write32(base, reg, val);
> > > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > + unsigned int val;
> > > > > +
> > > > > + isp1760_hcd_clear(hcd, field);
> > > > > +
> > > > > + return regmap_field_read_poll_timeout(priv->fields[field], val, 0, 1,
> > > > > + timeout_us);
> > > > > +}
> > > > > +
> > > > > +static bool isp1760_hcd_is_set(struct usb_hcd *hcd, u32 field)
> > > > > +{
> > > > > + return !!isp1760_hcd_read(hcd, field);
> > > > > }
> > > > >
> > > > > /*
> > > > > @@ -231,12 +278,15 @@ static void bank_reads8(void __iomem *src_base, u32 src_offset, u32 bank_addr,
> > > > > }
> > > > > }
> > > > >
> > > > > -static void mem_reads8(void __iomem *src_base, u32 src_offset, void *dst,
> > > > > - u32 bytes)
> > > > > +static void mem_reads8(struct usb_hcd *hcd, void __iomem *src_base,
> > > > > + u32 src_offset, void *dst, u32 bytes)
> > > > > {
> > > > > - reg_write32(src_base, HC_MEMORY_REG, src_offset + ISP_BANK(0));
> > > > > + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> > > > > + isp1760_hcd_write(hcd, MEM_START_ADDR, src_offset);
> > > > > +
> > > > > ndelay(90);
> > > > > - bank_reads8(src_base, src_offset, ISP_BANK(0), dst, bytes);
> > > > > +
> > > > > + bank_reads8(src_base, src_offset, ISP_BANK_0, dst, bytes);
> > > > > }
> > > > >
> > > > > static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> > > > > @@ -278,14 +328,15 @@ static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
> > > > > * Read and write ptds. 'ptd_offset' should be one of ISO_PTD_OFFSET,
> > > > > * INT_PTD_OFFSET, and ATL_PTD_OFFSET. 'slot' should be less than 32.
> > > > > */
> > > > > -static void ptd_read(void __iomem *base, u32 ptd_offset, u32 slot,
> > > > > - struct ptd *ptd)
> > > > > +static void ptd_read(struct usb_hcd *hcd, void __iomem *base,
> > > > > + u32 ptd_offset, u32 slot, struct ptd *ptd)
> > > > > {
> > > > > - reg_write32(base, HC_MEMORY_REG,
> > > > > - ISP_BANK(0) + ptd_offset + slot*sizeof(*ptd));
> > > > > + isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
> > > > > + isp1760_hcd_write(hcd, MEM_START_ADDR,
> > > > > + ptd_offset + slot * sizeof(*ptd));
> > > > > ndelay(90);
> > > > > - bank_reads8(base, ptd_offset + slot*sizeof(*ptd), ISP_BANK(0),
> > > > > - (void *) ptd, sizeof(*ptd));
> > > > > + bank_reads8(base, ptd_offset + slot * sizeof(*ptd), ISP_BANK_0,
> > > > > + (void *)ptd, sizeof(*ptd));
> > > > > }
> > > > >
> > > > > static void ptd_write(void __iomem *base, u32 ptd_offset, u32 slot,
> > > > > @@ -377,34 +428,15 @@ static void free_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
> > > > > qtd->payload_addr = 0;
> > > > > }
> > > > >
> > > > > -static int handshake(struct usb_hcd *hcd, u32 reg,
> > > > > - u32 mask, u32 done, int usec)
> > > > > -{
> > > > > - u32 result;
> > > > > - int ret;
> > > > > -
> > > > > - ret = readl_poll_timeout_atomic(hcd->regs + reg, result,
> > > > > - ((result & mask) == done ||
> > > > > - result == U32_MAX), 1, usec);
> > > > > - if (result == U32_MAX)
> > > > > - return -ENODEV;
> > > > > -
> > > > > - return ret;
> > > > > -}
> > > > > -
> > > > > /* reset a non-running (STS_HALT == 1) controller */
> > > > > static int ehci_reset(struct usb_hcd *hcd)
> > > > > {
> > > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > >
> > > > > - u32 command = reg_read32(hcd->regs, HC_USBCMD);
> > > > > -
> > > > > - command |= CMD_RESET;
> > > > > - reg_write32(hcd->regs, HC_USBCMD, command);
> > > > > hcd->state = HC_STATE_HALT;
> > > > > priv->next_statechange = jiffies;
> > > > >
> > > > > - return handshake(hcd, HC_USBCMD, CMD_RESET, 0, 250 * 1000);
> > > > > + return isp1760_hcd_set_poll_timeout(hcd, CMD_RESET, 250 * 1000);
> > > > > }
> > > > >
> > > > > static struct isp1760_qh *qh_alloc(gfp_t flags)
> > > > > @@ -432,8 +464,10 @@ static void qh_free(struct isp1760_qh *qh)
> > > > > /* one-time init, only for memory state */
> > > > > static int priv_init(struct usb_hcd *hcd)
> > > > > {
> > > > > - struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > - u32 hcc_params;
> > > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > + u32 isoc_cache;
> > > > > + u32 isoc_thres;
> > > > > +
> > > > > int i;
> > > > >
> > > > > spin_lock_init(&priv->lock);
> > > > > @@ -448,12 +482,14 @@ static int priv_init(struct usb_hcd *hcd)
> > > > > priv->periodic_size = DEFAULT_I_TDPS;
> > > > >
> > > > > /* controllers may cache some of the periodic schedule ... */
> > > > > - hcc_params = reg_read32(hcd->regs, HC_HCCPARAMS);
> > > > > + isoc_cache = isp1760_hcd_read(hcd->regs, HCC_ISOC_CACHE);
> > > > > + isoc_thres = isp1760_hcd_read(hcd->regs, HCC_ISOC_THRES);
> > > > > +
> > > > > /* full frame cache */
> > > > > - if (HCC_ISOC_CACHE(hcc_params))
> > > > > + if (isoc_cache)
> > > > > priv->i_thresh = 8;
> > > > > else /* N microframes cached */
> > > > > - priv->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
> > > > > + priv->i_thresh = 2 + isoc_thres;
> > > > >
> > > > > return 0;
> > > > > }
> > > > > @@ -462,12 +498,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > > > > {
> > > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > int result;
> > > > > - u32 scratch, hwmode;
> > > > > + u32 scratch;
> > > > > +
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_SCRATCH, 0xdeadbabe);
> > > > >
> > > > > - reg_write32(hcd->regs, HC_SCRATCH_REG, 0xdeadbabe);
> > > > > /* Change bus pattern */
> > > > > - scratch = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> > > > > - scratch = reg_read32(hcd->regs, HC_SCRATCH_REG);
> > > > > + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> > > > > + scratch = isp1760_reg_read(priv->regs, ISP176x_HC_SCRATCH);
> > > > > if (scratch != 0xdeadbabe) {
> > > > > dev_err(hcd->self.controller, "Scratch test failed.\n");
> > > > > return -ENODEV;
> > > > > @@ -481,10 +518,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > > > > * the host controller through the EHCI USB Command register. The device
> > > > > * has been reset in core code anyway, so this shouldn't matter.
> > > > > */
> > > > > - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG, 0);
> > > > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > > > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > > > > - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, NO_TRANSFER_ACTIVE);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_BUFFER_STATUS, 0);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > > > > + NO_TRANSFER_ACTIVE);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > > > > + NO_TRANSFER_ACTIVE);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP,
> > > > > + NO_TRANSFER_ACTIVE);
> > > > >
> > > > > result = ehci_reset(hcd);
> > > > > if (result)
> > > > > @@ -493,14 +533,11 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
> > > > > /* Step 11 passed */
> > > > >
> > > > > /* ATL reset */
> > > > > - hwmode = reg_read32(hcd->regs, HC_HW_MODE_CTRL) & ~ALL_ATX_RESET;
> > > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode | ALL_ATX_RESET);
> > > > > + isp1760_hcd_set(hcd, ALL_ATX_RESET);
> > > > > mdelay(10);
> > > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, hwmode);
> > > > > -
> > > > > - reg_write32(hcd->regs, HC_INTERRUPT_ENABLE, INTERRUPT_ENABLE_MASK);
> > > > > + isp1760_hcd_clear(hcd, ALL_ATX_RESET);
> > > > >
> > > > > - priv->hcs_params = reg_read32(hcd->regs, HC_HCSPARAMS);
> > > > > + isp1760_hcd_set(hcd, HC_INT_ENABLE);
> > > > >
> > > > > return priv_init(hcd);
> > > > > }
> > > > > @@ -730,12 +767,12 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
> > > > >
> > > > > /* Make sure done map has not triggered from some unlinked transfer */
> > > > > if (ptd_offset == ATL_PTD_OFFSET) {
> > > > > - priv->atl_done_map |= reg_read32(hcd->regs,
> > > > > - HC_ATL_PTD_DONEMAP_REG);
> > > > > + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> > > > > + ISP176x_HC_ATL_PTD_DONEMAP);
> > > > > priv->atl_done_map &= ~(1 << slot);
> > > > > } else {
> > > > > - priv->int_done_map |= reg_read32(hcd->regs,
> > > > > - HC_INT_PTD_DONEMAP_REG);
> > > > > + priv->int_done_map |= isp1760_reg_read(priv->regs,
> > > > > + ISP176x_HC_INT_PTD_DONEMAP);
> > > > > priv->int_done_map &= ~(1 << slot);
> > > > > }
> > > > >
> > > > > @@ -744,16 +781,20 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
> > > > > slots[slot].timestamp = jiffies;
> > > > > slots[slot].qtd = qtd;
> > > > > slots[slot].qh = qh;
> > > > > - ptd_write(hcd->regs, ptd_offset, slot, ptd);
> > > > > + ptd_write(priv->base, ptd_offset, slot, ptd);
> > > > >
> > > > > if (ptd_offset == ATL_PTD_OFFSET) {
> > > > > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > > > > + skip_map = isp1760_reg_read(priv->regs,
> > > > > + ISP176x_HC_ATL_PTD_SKIPMAP);
> > > > > skip_map &= ~(1 << qh->slot);
> > > > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > > > > + skip_map);
> > > > > } else {
> > > > > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > > > > + skip_map = isp1760_reg_read(priv->regs,
> > > > > + ISP176x_HC_INT_PTD_SKIPMAP);
> > > > > skip_map &= ~(1 << qh->slot);
> > > > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > > > > + skip_map);
> > > > > }
> > > > > }
> > > > >
> > > > > @@ -766,9 +807,10 @@ static int is_short_bulk(struct isp1760_qtd *qtd)
> > > > > static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> > > > > struct list_head *urb_list)
> > > > > {
> > > > > - int last_qtd;
> > > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > struct isp1760_qtd *qtd, *qtd_next;
> > > > > struct urb_listitem *urb_listitem;
> > > > > + int last_qtd;
> > > > >
> > > > > list_for_each_entry_safe(qtd, qtd_next, &qh->qtd_list, qtd_list) {
> > > > > if (qtd->status < QTD_XFER_COMPLETE)
> > > > > @@ -783,9 +825,10 @@ static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
> > > > > if (qtd->actual_length) {
> > > > > switch (qtd->packet_type) {
> > > > > case IN_PID:
> > > > > - mem_reads8(hcd->regs, qtd->payload_addr,
> > > > > - qtd->data_buffer,
> > > > > - qtd->actual_length);
> > > > > + mem_reads8(hcd, priv->base,
> > > > > + qtd->payload_addr,
> > > > > + qtd->data_buffer,
> > > > > + qtd->actual_length);
> > > > > fallthrough;
> > > > > case OUT_PID:
> > > > > qtd->urb->actual_length +=
> > > > > @@ -873,8 +916,8 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
> > > > > if ((qtd->length) &&
> > > > > ((qtd->packet_type == SETUP_PID) ||
> > > > > (qtd->packet_type == OUT_PID))) {
> > > > > - mem_writes8(hcd->regs, qtd->payload_addr,
> > > > > - qtd->data_buffer, qtd->length);
> > > > > + mem_writes8(priv->base, qtd->payload_addr,
> > > > > + qtd->data_buffer, qtd->length);
> > > > > }
> > > > >
> > > > > qtd->status = QTD_PAYLOAD_ALLOC;
> > > > > @@ -1074,9 +1117,9 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > > > int modified;
> > > > > int skip_map;
> > > > >
> > > > > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > > > > + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP);
> > > > > priv->int_done_map &= ~skip_map;
> > > > > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > > > > + skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP);
> > > > > priv->atl_done_map &= ~skip_map;
> > > > >
> > > > > modified = priv->int_done_map || priv->atl_done_map;
> > > > > @@ -1094,7 +1137,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > > > continue;
> > > > > }
> > > > > ptd_offset = INT_PTD_OFFSET;
> > > > > - ptd_read(hcd->regs, INT_PTD_OFFSET, slot, &ptd);
> > > > > + ptd_read(hcd, priv->base, INT_PTD_OFFSET, slot, &ptd);
> > > > > state = check_int_transfer(hcd, &ptd,
> > > > > slots[slot].qtd->urb);
> > > > > } else {
> > > > > @@ -1109,7 +1152,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > > > continue;
> > > > > }
> > > > > ptd_offset = ATL_PTD_OFFSET;
> > > > > - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> > > > > + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> > > > > state = check_atl_transfer(hcd, &ptd,
> > > > > slots[slot].qtd->urb);
> > > > > }
> > > > > @@ -1134,7 +1177,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
> > > > >
> > > > > qtd->status = QTD_XFER_COMPLETE;
> > > > > if (list_is_last(&qtd->qtd_list, &qh->qtd_list) ||
> > > > > - is_short_bulk(qtd))
> > > > > + is_short_bulk(qtd))
> > > > > qtd = NULL;
> > > > > else
> > > > > qtd = list_entry(qtd->qtd_list.next,
> > > > > @@ -1210,13 +1253,15 @@ static irqreturn_t isp1760_irq(struct usb_hcd *hcd)
> > > > > if (!(hcd->state & HC_STATE_RUNNING))
> > > > > goto leave;
> > > > >
> > > > > - imask = reg_read32(hcd->regs, HC_INTERRUPT_REG);
> > > > > + imask = isp1760_reg_read(priv->regs, ISP176x_HC_INTERRUPT);
> > > > > if (unlikely(!imask))
> > > > > goto leave;
> > > > > - reg_write32(hcd->regs, HC_INTERRUPT_REG, imask); /* Clear */
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INTERRUPT, imask); /* Clear */
> > > > >
> > > > > - priv->int_done_map |= reg_read32(hcd->regs, HC_INT_PTD_DONEMAP_REG);
> > > > > - priv->atl_done_map |= reg_read32(hcd->regs, HC_ATL_PTD_DONEMAP_REG);
> > > > > + priv->int_done_map |= isp1760_reg_read(priv->regs,
> > > > > + ISP176x_HC_INT_PTD_DONEMAP);
> > > > > + priv->atl_done_map |= isp1760_reg_read(priv->regs,
> > > > > + ISP176x_HC_ATL_PTD_DONEMAP);
> > > > >
> > > > > handle_done_ptds(hcd);
> > > > >
> > > > > @@ -1271,7 +1316,7 @@ static void errata2_function(struct timer_list *unused)
> > > > > if (priv->atl_slots[slot].qh && time_after(jiffies,
> > > > > priv->atl_slots[slot].timestamp +
> > > > > msecs_to_jiffies(SLOT_TIMEOUT))) {
> > > > > - ptd_read(hcd->regs, ATL_PTD_OFFSET, slot, &ptd);
> > > > > + ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
> > > > > if (!FROM_DW0_VALID(ptd.dw0) &&
> > > > > !FROM_DW3_ACTIVE(ptd.dw3))
> > > > > priv->atl_done_map |= 1 << slot;
> > > > > @@ -1288,9 +1333,8 @@ static void errata2_function(struct timer_list *unused)
> > > > >
> > > > > static int isp1760_run(struct usb_hcd *hcd)
> > > > > {
> > > > > + struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > int retval;
> > > > > - u32 temp;
> > > > > - u32 command;
> > > > > u32 chipid;
> > > > >
> > > > > hcd->uses_new_polling = 1;
> > > > > @@ -1298,23 +1342,20 @@ static int isp1760_run(struct usb_hcd *hcd)
> > > > > hcd->state = HC_STATE_RUNNING;
> > > > >
> > > > > /* Set PTD interrupt AND & OR maps */
> > > > > - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_AND_REG, 0);
> > > > > - reg_write32(hcd->regs, HC_ATL_IRQ_MASK_OR_REG, 0xffffffff);
> > > > > - reg_write32(hcd->regs, HC_INT_IRQ_MASK_AND_REG, 0);
> > > > > - reg_write32(hcd->regs, HC_INT_IRQ_MASK_OR_REG, 0xffffffff);
> > > > > - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_AND_REG, 0);
> > > > > - reg_write32(hcd->regs, HC_ISO_IRQ_MASK_OR_REG, 0xffffffff);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_AND, 0);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_OR, 0xffffffff);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_AND, 0);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_OR, 0xffffffff);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_AND, 0);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_OR, 0xffffffff);
> > > > > /* step 23 passed */
> > > > >
> > > > > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp | HW_GLOBAL_INTR_EN);
> > > > > + isp1760_hcd_set(hcd, HW_GLOBAL_INTR_EN);
> > > > >
> > > > > - command = reg_read32(hcd->regs, HC_USBCMD);
> > > > > - command &= ~(CMD_LRESET|CMD_RESET);
> > > > > - command |= CMD_RUN;
> > > > > - reg_write32(hcd->regs, HC_USBCMD, command);
> > > > > + isp1760_hcd_clear(hcd, CMD_LRESET);
> > > > > + isp1760_hcd_clear(hcd, CMD_RESET);
> > > > >
> > > > > - retval = handshake(hcd, HC_USBCMD, CMD_RUN, CMD_RUN, 250 * 1000);
> > > > > + retval = isp1760_hcd_set_poll_timeout(hcd, CMD_RUN, 250 * 1000);
> > > > > if (retval)
> > > > > return retval;
> > > > >
> > > > > @@ -1324,9 +1365,8 @@ static int isp1760_run(struct usb_hcd *hcd)
> > > > > * the semaphore while doing so.
> > > > > */
> > > > > down_write(&ehci_cf_port_reset_rwsem);
> > > > > - reg_write32(hcd->regs, HC_CONFIGFLAG, FLAG_CF);
> > > > >
> > > > > - retval = handshake(hcd, HC_CONFIGFLAG, FLAG_CF, FLAG_CF, 250 * 1000);
> > > > > + retval = isp1760_hcd_set_poll_timeout(hcd, FLAG_CF, 250 * 1000);
> > > > > up_write(&ehci_cf_port_reset_rwsem);
> > > > > if (retval)
> > > > > return retval;
> > > > > @@ -1336,21 +1376,22 @@ static int isp1760_run(struct usb_hcd *hcd)
> > > > > errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
> > > > > add_timer(&errata2_timer);
> > > > >
> > > > > - chipid = reg_read32(hcd->regs, HC_CHIP_ID_REG);
> > > > > + chipid = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
> > > > > dev_info(hcd->self.controller, "USB ISP %04x HW rev. %d started\n",
> > > > > chipid & 0xffff, chipid >> 16);
> > > > >
> > > > > /* PTD Register Init Part 2, Step 28 */
> > > > >
> > > > > /* Setup registers controlling PTD checking */
> > > > > - reg_write32(hcd->regs, HC_ATL_PTD_LASTPTD_REG, 0x80000000);
> > > > > - reg_write32(hcd->regs, HC_INT_PTD_LASTPTD_REG, 0x80000000);
> > > > > - reg_write32(hcd->regs, HC_ISO_PTD_LASTPTD_REG, 0x00000001);
> > > > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, 0xffffffff);
> > > > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, 0xffffffff);
> > > > > - reg_write32(hcd->regs, HC_ISO_PTD_SKIPMAP_REG, 0xffffffff);
> > > > > - reg_write32(hcd->regs, HC_BUFFER_STATUS_REG,
> > > > > - ATL_BUF_FILL | INT_BUF_FILL);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_LASTPTD, 0x80000000);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_LASTPTD, 0x80000000);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_LASTPTD, 0x00000001);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP, 0xffffffff);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP, 0xffffffff);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP, 0xffffffff);
> > > > > +
> > > > > + isp1760_hcd_set(hcd, ATL_BUF_FILL);
> > > > > + isp1760_hcd_set(hcd, INT_BUF_FILL);
> > > > >
> > > > > /* GRR this is run-once init(), being done every time the HC starts.
> > > > > * So long as they're part of class devices, we can't do it init()
> > > > > @@ -1584,15 +1625,19 @@ static void kill_transfer(struct usb_hcd *hcd, struct urb *urb,
> > > > > /* We need to forcefully reclaim the slot since some transfers never
> > > > > return, e.g. interrupt transfers and NAKed bulk transfers. */
> > > > > if (usb_pipecontrol(urb->pipe) || usb_pipebulk(urb->pipe)) {
> > > > > - skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG);
> > > > > + skip_map = isp1760_reg_read(priv->regs,
> > > > > + ISP176x_HC_ATL_PTD_SKIPMAP);
> > > > > skip_map |= (1 << qh->slot);
> > > > > - reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
> > > > > + skip_map);
> > > > > priv->atl_slots[qh->slot].qh = NULL;
> > > > > priv->atl_slots[qh->slot].qtd = NULL;
> > > > > } else {
> > > > > - skip_map = reg_read32(hcd->regs, HC_INT_PTD_SKIPMAP_REG);
> > > > > + skip_map = isp1760_reg_read(priv->regs,
> > > > > + ISP176x_HC_INT_PTD_SKIPMAP);
> > > > > skip_map |= (1 << qh->slot);
> > > > > - reg_write32(hcd->regs, HC_INT_PTD_SKIPMAP_REG, skip_map);
> > > > > + isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
> > > > > + skip_map);
> > > > > priv->int_slots[qh->slot].qh = NULL;
> > > > > priv->int_slots[qh->slot].qtd = NULL;
> > > > > }
> > > > > @@ -1705,8 +1750,7 @@ static void isp1760_endpoint_disable(struct usb_hcd *hcd,
> > > > > static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > > > {
> > > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > - u32 temp, status = 0;
> > > > > - u32 mask;
> > > > > + u32 status = 0;
> > > > > int retval = 1;
> > > > > unsigned long flags;
> > > > >
> > > > > @@ -1716,17 +1760,13 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > > >
> > > > > /* init status to no-changes */
> > > > > buf[0] = 0;
> > > > > - mask = PORT_CSC;
> > > > >
> > > > > spin_lock_irqsave(&priv->lock, flags);
> > > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > > >
> > > > > - if (temp & PORT_OWNER) {
> > > > > - if (temp & PORT_CSC) {
> > > > > - temp &= ~PORT_CSC;
> > > > > - reg_write32(hcd->regs, HC_PORTSC1, temp);
> > > > > - goto done;
> > > > > - }
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_OWNER) &&
> > > > > + isp1760_hcd_is_set(hcd, PORT_CSC)) {
> > > > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > > > + goto done;
> > > > > }
> > > > >
> > > > > /*
> > > > > @@ -1735,11 +1775,9 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > > > * high-speed device is switched over to the companion
> > > > > * controller by the user.
> > > > > */
> > > > > -
> > > > > - if ((temp & mask) != 0
> > > > > - || ((temp & PORT_RESUME) != 0
> > > > > - && time_after_eq(jiffies,
> > > > > - priv->reset_done))) {
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_CSC) ||
> > > > > + (isp1760_hcd_is_set(hcd, PORT_RESUME) &&
> > > > > + time_after_eq(jiffies, priv->reset_done))) {
> > > > > buf [0] |= 1 << (0 + 1);
> > > > > status = STS_PCD;
> > > > > }
> > > > > @@ -1752,9 +1790,11 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
> > > > > static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > > > > struct usb_hub_descriptor *desc)
> > > > > {
> > > > > - int ports = HCS_N_PORTS(priv->hcs_params);
> > > > > + int ports;
> > > > > u16 temp;
> > > > >
> > > > > + ports = isp1760_hcd_read(priv->hcd, HCS_N_PORTS);
> > > > > +
> > > > > desc->bDescriptorType = USB_DT_HUB;
> > > > > /* priv 1.0, 2.3.9 says 20ms max */
> > > > > desc->bPwrOn2PwrGood = 10;
> > > > > @@ -1770,7 +1810,7 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > > > >
> > > > > /* per-port overcurrent reporting */
> > > > > temp = HUB_CHAR_INDV_PORT_OCPM;
> > > > > - if (HCS_PPC(priv->hcs_params))
> > > > > + if (isp1760_hcd_is_set(priv->hcd, HCS_PPC))
> > > > > /* per-port power control */
> > > > > temp |= HUB_CHAR_INDV_PORT_LPSM;
> > > > > else
> > > > > @@ -1781,38 +1821,37 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
> > > > >
> > > > > #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)
> > > > >
> > > > > -static int check_reset_complete(struct usb_hcd *hcd, int index,
> > > > > - int port_status)
> > > > > +static void check_reset_complete(struct usb_hcd *hcd, int index)
> > > > > {
> > > > > - if (!(port_status & PORT_CONNECT))
> > > > > - return port_status;
> > > > > + if (!(isp1760_hcd_is_set(hcd, PORT_CONNECT)))
> > > > > + return;
> > > > >
> > > > > /* if reset finished and it's still not enabled -- handoff */
> > > > > - if (!(port_status & PORT_PE)) {
> > > > > -
> > > > > + if (!isp1760_hcd_is_set(hcd, PORT_PE)) {
> > > > > dev_info(hcd->self.controller,
> > > > > "port %d full speed --> companion\n",
> > > > > index + 1);
> > > > >
> > > > > - port_status |= PORT_OWNER;
> > > > > - port_status &= ~PORT_RWC_BITS;
> > > > > - reg_write32(hcd->regs, HC_PORTSC1, port_status);
> > > > > + isp1760_hcd_set(hcd, PORT_OWNER);
> > > > >
> > > > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > > > } else
> > > > > dev_info(hcd->self.controller, "port %d high speed\n",
> > > > > index + 1);
> > > > >
> > > > > - return port_status;
> > > > > + return;
> > > > > }
> > > > >
> > > > > static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > u16 wValue, u16 wIndex, char *buf, u16 wLength)
> > > > > {
> > > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > - int ports = HCS_N_PORTS(priv->hcs_params);
> > > > > - u32 temp, status;
> > > > > + u32 status;
> > > > > unsigned long flags;
> > > > > int retval = 0;
> > > > > + int ports;
> > > > > +
> > > > > + ports = isp1760_hcd_read(hcd, HCS_N_PORTS);
> > > > >
> > > > > /*
> > > > > * FIXME: support SetPortFeatures USB_PORT_FEAT_INDICATOR.
> > > > > @@ -1837,7 +1876,6 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > if (!wIndex || wIndex > ports)
> > > > > goto error;
> > > > > wIndex--;
> > > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > > >
> > > > > /*
> > > > > * Even if OWNER is set, so the port is owned by the
> > > > > @@ -1848,22 +1886,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > >
> > > > > switch (wValue) {
> > > > > case USB_PORT_FEAT_ENABLE:
> > > > > - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_PE);
> > > > > + isp1760_hcd_clear(hcd, PORT_PE);
> > > > > break;
> > > > > case USB_PORT_FEAT_C_ENABLE:
> > > > > /* XXX error? */
> > > > > break;
> > > > > case USB_PORT_FEAT_SUSPEND:
> > > > > - if (temp & PORT_RESET)
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> > > > > goto error;
> > > > >
> > > > > - if (temp & PORT_SUSPEND) {
> > > > > - if ((temp & PORT_PE) == 0)
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND)) {
> > > > > + if (!isp1760_hcd_is_set(hcd, PORT_PE))
> > > > > goto error;
> > > > > /* resume signaling for 20 msec */
> > > > > - temp &= ~(PORT_RWC_BITS);
> > > > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > > > - temp | PORT_RESUME);
> > > > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > > > + isp1760_hcd_set(hcd, PORT_RESUME);
> > > > > +
> > > > > priv->reset_done = jiffies +
> > > > > msecs_to_jiffies(USB_RESUME_TIMEOUT);
> > > > > }
> > > > > @@ -1872,12 +1910,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > /* we auto-clear this feature */
> > > > > break;
> > > > > case USB_PORT_FEAT_POWER:
> > > > > - if (HCS_PPC(priv->hcs_params))
> > > > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > > > - temp & ~PORT_POWER);
> > > > > + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> > > > > + isp1760_hcd_clear(hcd, PORT_POWER);
> > > > > break;
> > > > > case USB_PORT_FEAT_C_CONNECTION:
> > > > > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_CSC);
> > > > > + isp1760_hcd_set(hcd, PORT_CSC);
> > > > > break;
> > > > > case USB_PORT_FEAT_C_OVER_CURRENT:
> > > > > /* XXX error ?*/
> > > > > @@ -1888,7 +1925,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > default:
> > > > > goto error;
> > > > > }
> > > > > - reg_read32(hcd->regs, HC_USBCMD);
> > > > > + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> > > > > break;
> > > > > case GetHubDescriptor:
> > > > > isp1760_hub_descriptor(priv, (struct usb_hub_descriptor *)
> > > > > @@ -1903,15 +1940,14 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > goto error;
> > > > > wIndex--;
> > > > > status = 0;
> > > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > > >
> > > > > /* wPortChange bits */
> > > > > - if (temp & PORT_CSC)
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_CSC))
> > > > > status |= USB_PORT_STAT_C_CONNECTION << 16;
> > > > >
> > > > >
> > > > > /* whoever resumes must GetPortStatus to complete it!! */
> > > > > - if (temp & PORT_RESUME) {
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_RESUME)) {
> > > > > dev_err(hcd->self.controller, "Port resume should be skipped.\n");
> > > > >
> > > > > /* Remote Wakeup received? */
> > > > > @@ -1930,35 +1966,31 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > priv->reset_done = 0;
> > > > >
> > > > > /* stop resume signaling */
> > > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > > > - temp & ~(PORT_RWC_BITS | PORT_RESUME));
> > > > > - retval = handshake(hcd, HC_PORTSC1,
> > > > > - PORT_RESUME, 0, 2000 /* 2msec */);
> > > > > + isp1760_hcd_clear(hcd, PORT_CSC);
> > > > > +
> > > > > + retval = isp1760_hcd_clear_poll_timeout(hcd,
> > > > > + PORT_RESUME, 2000);
> > > > > if (retval != 0) {
> > > > > dev_err(hcd->self.controller,
> > > > > "port %d resume error %d\n",
> > > > > wIndex + 1, retval);
> > > > > goto error;
> > > > > }
> > > > > - temp &= ~(PORT_SUSPEND|PORT_RESUME|(3<<10));
> > > > > }
> > > > > }
> > > > >
> > > > > /* whoever resets must GetPortStatus to complete it!! */
> > > > > - if ((temp & PORT_RESET)
> > > > > - && time_after_eq(jiffies,
> > > > > - priv->reset_done)) {
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_RESET) &&
> > > > > + time_after_eq(jiffies, priv->reset_done)) {
> > > > > status |= USB_PORT_STAT_C_RESET << 16;
> > > > > priv->reset_done = 0;
> > > > >
> > > > > /* force reset to complete */
> > > > > - reg_write32(hcd->regs, HC_PORTSC1, temp & ~PORT_RESET);
> > > > > /* REVISIT: some hardware needs 550+ usec to clear
> > > > > * this bit; seems too long to spin routinely...
> > > > > */
> > > > > - retval = handshake(hcd, HC_PORTSC1,
> > > > > - PORT_RESET, 0, 750);
> > > > > + retval = isp1760_hcd_clear_poll_timeout(hcd, PORT_RESET,
> > > > > + 750);
> > > > > if (retval != 0) {
> > > > > dev_err(hcd->self.controller, "port %d reset error %d\n",
> > > > > wIndex + 1, retval);
> > > > > @@ -1966,8 +1998,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > }
> > > > >
> > > > > /* see what we found out */
> > > > > - temp = check_reset_complete(hcd, wIndex,
> > > > > - reg_read32(hcd->regs, HC_PORTSC1));
> > > > > + check_reset_complete(hcd, wIndex);
> > > > > }
> > > > > /*
> > > > > * Even if OWNER is set, there's no harm letting hub_wq
> > > > > @@ -1975,21 +2006,22 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > * for PORT_POWER anyway).
> > > > > */
> > > > >
> > > > > - if (temp & PORT_OWNER)
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> > > > > dev_err(hcd->self.controller, "PORT_OWNER is set\n");
> > > > >
> > > > > - if (temp & PORT_CONNECT) {
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_CONNECT)) {
> > > > > status |= USB_PORT_STAT_CONNECTION;
> > > > > /* status may be from integrated TT */
> > > > > status |= USB_PORT_STAT_HIGH_SPEED;
> > > > > }
> > > > > - if (temp & PORT_PE)
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_PE))
> > > > > status |= USB_PORT_STAT_ENABLE;
> > > > > - if (temp & (PORT_SUSPEND|PORT_RESUME))
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_SUSPEND) &&
> > > > > + isp1760_hcd_is_set(hcd, PORT_RESUME))
> > > > > status |= USB_PORT_STAT_SUSPEND;
> > > > > - if (temp & PORT_RESET)
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_RESET))
> > > > > status |= USB_PORT_STAT_RESET;
> > > > > - if (temp & PORT_POWER)
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_POWER))
> > > > > status |= USB_PORT_STAT_POWER;
> > > > >
> > > > > put_unaligned(cpu_to_le32(status), (__le32 *) buf);
> > > > > @@ -2009,41 +2041,39 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > if (!wIndex || wIndex > ports)
> > > > > goto error;
> > > > > wIndex--;
> > > > > - temp = reg_read32(hcd->regs, HC_PORTSC1);
> > > > > - if (temp & PORT_OWNER)
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_OWNER))
> > > > > break;
> > > > >
> > > > > -/* temp &= ~PORT_RWC_BITS; */
> > > > > switch (wValue) {
> > > > > case USB_PORT_FEAT_ENABLE:
> > > > > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_PE);
> > > > > + isp1760_hcd_set(hcd, PORT_PE);
> > > > > break;
> > > > >
> > > > > case USB_PORT_FEAT_SUSPEND:
> > > > > - if ((temp & PORT_PE) == 0
> > > > > - || (temp & PORT_RESET) != 0)
> > > > > + if (!isp1760_hcd_is_set(hcd, PORT_PE) ||
> > > > > + isp1760_hcd_is_set(hcd, PORT_RESET))
> > > > > goto error;
> > > > >
> > > > > - reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_SUSPEND);
> > > > > + isp1760_hcd_set(hcd, PORT_SUSPEND);
> > > > > break;
> > > > > case USB_PORT_FEAT_POWER:
> > > > > - if (HCS_PPC(priv->hcs_params))
> > > > > - reg_write32(hcd->regs, HC_PORTSC1,
> > > > > - temp | PORT_POWER);
> > > > > + if (isp1760_hcd_is_set(hcd, HCS_PPC))
> > > > > + isp1760_hcd_set(hcd, PORT_POWER);
> > > > > break;
> > > > > case USB_PORT_FEAT_RESET:
> > > > > - if (temp & PORT_RESUME)
> > > > > + if (isp1760_hcd_is_set(hcd, PORT_RESUME))
> > > > > goto error;
> > > > > /* line status bits may report this as low speed,
> > > > > * which can be fine if this root hub has a
> > > > > * transaction translator built in.
> > > > > */
> > > > > - if ((temp & (PORT_PE|PORT_CONNECT)) == PORT_CONNECT
> > > > > - && PORT_USB11(temp)) {
> > > > > - temp |= PORT_OWNER;
> > > > > + if ((isp1760_hcd_is_set(hcd, PORT_CONNECT) &&
> > > > > + !isp1760_hcd_is_set(hcd, PORT_PE)) &&
> > > > > + (isp1760_hcd_read(hcd, PORT_LSTATUS) == 1)) {
> > > > > + isp1760_hcd_set(hcd, PORT_OWNER);
> > > > > } else {
> > > > > - temp |= PORT_RESET;
> > > > > - temp &= ~PORT_PE;
> > > > > + isp1760_hcd_set(hcd, PORT_RESET);
> > > > > + isp1760_hcd_clear(hcd, PORT_PE);
> > > > >
> > > > > /*
> > > > > * caller must wait, then call GetPortStatus
> > > > > @@ -2052,12 +2082,11 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
> > > > > priv->reset_done = jiffies +
> > > > > msecs_to_jiffies(50);
> > > > > }
> > > > > - reg_write32(hcd->regs, HC_PORTSC1, temp);
> > > > > break;
> > > > > default:
> > > > > goto error;
> > > > > }
> > > > > - reg_read32(hcd->regs, HC_USBCMD);
> > > > > + isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
> > > > > break;
> > > > >
> > > > > default:
> > > > > @@ -2074,14 +2103,13 @@ static int isp1760_get_frame(struct usb_hcd *hcd)
> > > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > u32 fr;
> > > > >
> > > > > - fr = reg_read32(hcd->regs, HC_FRINDEX);
> > > > > + fr = isp1760_hcd_read(hcd, HC_FRINDEX);
> > > > > return (fr >> 3) % priv->periodic_size;
> > > > > }
> > > > >
> > > > > static void isp1760_stop(struct usb_hcd *hcd)
> > > > > {
> > > > > struct isp1760_hcd *priv = hcd_to_priv(hcd);
> > > > > - u32 temp;
> > > > >
> > > > > del_timer(&errata2_timer);
> > > > >
> > > > > @@ -2092,24 +2120,19 @@ static void isp1760_stop(struct usb_hcd *hcd)
> > > > > spin_lock_irq(&priv->lock);
> > > > > ehci_reset(hcd);
> > > > > /* Disable IRQ */
> > > > > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
> > > > > + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> > > > > spin_unlock_irq(&priv->lock);
> > > > >
> > > > > - reg_write32(hcd->regs, HC_CONFIGFLAG, 0);
> > > > > + isp1760_hcd_clear(hcd, FLAG_CF);
> > > > > }
> > > > >
> > > > > static void isp1760_shutdown(struct usb_hcd *hcd)
> > > > > {
> > > > > - u32 command, temp;
> > > > > -
> > > > > isp1760_stop(hcd);
> > > > > - temp = reg_read32(hcd->regs, HC_HW_MODE_CTRL);
> > > > > - reg_write32(hcd->regs, HC_HW_MODE_CTRL, temp &= ~HW_GLOBAL_INTR_EN);
> > > > >
> > > > > - command = reg_read32(hcd->regs, HC_USBCMD);
> > > > > - command &= ~CMD_RUN;
> > > > > - reg_write32(hcd->regs, HC_USBCMD, command);
> > > > > + isp1760_hcd_clear(hcd, HW_GLOBAL_INTR_EN);
> > > > > +
> > > > > + isp1760_hcd_clear(hcd, CMD_RUN);
> > > > > }
> > > > >
> > > > > static void isp1760_clear_tt_buffer_complete(struct usb_hcd *hcd,
> > > > > @@ -2182,8 +2205,8 @@ void isp1760_deinit_kmem_cache(void)
> > > > > kmem_cache_destroy(urb_listitem_cachep);
> > > > > }
> > > > >
> > > > > -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > > > > - struct resource *mem, int irq, unsigned long irqflags,
> > > > > +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> > > > > + int irq, unsigned long irqflags,
> > > > > struct device *dev)
> > > > > {
> > > > > struct usb_hcd *hcd;
> > > > > @@ -2200,7 +2223,6 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > > > > init_memory(priv);
> > > > >
> > > > > hcd->irq = irq;
> > > > > - hcd->regs = regs;
> > > > > hcd->rsrc_start = mem->start;
> > > > > hcd->rsrc_len = resource_size(mem);
> > > > >
> > > > > diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
> > > > > index f1bb2deb1ccf..34e1899e52c4 100644
> > > > > --- a/drivers/usb/isp1760/isp1760-hcd.h
> > > > > +++ b/drivers/usb/isp1760/isp1760-hcd.h
> > > > > @@ -3,6 +3,9 @@
> > > > > #define _ISP1760_HCD_H_
> > > > >
> > > > > #include <linux/spinlock.h>
> > > > > +#include <linux/regmap.h>
> > > > > +
> > > > > +#include "isp1760-regs.h"
> > > > >
> > > > > struct isp1760_qh;
> > > > > struct isp1760_qtd;
> > > > > @@ -48,10 +51,13 @@ enum isp1760_queue_head_types {
> > > > > };
> > > > >
> > > > > struct isp1760_hcd {
> > > > > -#ifdef CONFIG_USB_ISP1760_HCD
> > > > > struct usb_hcd *hcd;
> > > > >
> > > > > - u32 hcs_params;
> > > > > + void __iomem *base;
> > > > > +
> > > > > + struct regmap *regs;
> > > > > + struct regmap_field *fields[HC_FIELD_MAX];
> > > > > +
> > > > > spinlock_t lock;
> > > > > struct isp1760_slotinfo atl_slots[32];
> > > > > int atl_done_map;
> > > > > @@ -66,20 +72,18 @@ struct isp1760_hcd {
> > > > > unsigned i_thresh;
> > > > > unsigned long reset_done;
> > > > > unsigned long next_statechange;
> > > > > -#endif
> > > > > };
> > > > >
> > > > > #ifdef CONFIG_USB_ISP1760_HCD
> > > > > -int isp1760_hcd_register(struct isp1760_hcd *priv, void __iomem *regs,
> > > > > - struct resource *mem, int irq, unsigned long irqflags,
> > > > > - struct device *dev);
> > > > > +int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
> > > > > + int irq, unsigned long irqflags, struct device *dev);
> > > > > void isp1760_hcd_unregister(struct isp1760_hcd *priv);
> > > > >
> > > > > int isp1760_init_kmem_once(void);
> > > > > void isp1760_deinit_kmem_cache(void);
> > > > > #else
> > > > > static inline int isp1760_hcd_register(struct isp1760_hcd *priv,
> > > > > - void __iomem *regs, struct resource *mem,
> > > > > + struct resource *mem,
> > > > > int irq, unsigned long irqflags,
> > > > > struct device *dev)
> > > > > {
> > > > > diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
> > > > > index ccd30f835888..abfba9f5ec23 100644
> > > > > --- a/drivers/usb/isp1760/isp1760-if.c
> > > > > +++ b/drivers/usb/isp1760/isp1760-if.c
> > > > > @@ -75,9 +75,9 @@ static int isp1761_pci_init(struct pci_dev *dev)
> > > > > /*by default host is in 16bit mode, so
> > > > > * io operations at this stage must be 16 bit
> > > > > * */
> > > > > - writel(0xface, iobase + HC_SCRATCH_REG);
> > > > > + writel(0xface, iobase + ISP176x_HC_SCRATCH);
> > > > > udelay(100);
> > > > > - reg_data = readl(iobase + HC_SCRATCH_REG) & 0x0000ffff;
> > > > > + reg_data = readl(iobase + ISP176x_HC_SCRATCH) & 0x0000ffff;
> > > > > retry_count--;
> > > > > }
> > > > >
> > > > > diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
> > > > > index fedc4f5cded0..42ee4404c90b 100644
> > > > > --- a/drivers/usb/isp1760/isp1760-regs.h
> > > > > +++ b/drivers/usb/isp1760/isp1760-regs.h
> > > > > @@ -10,218 +10,286 @@
> > > > > * Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > > > */
> > > > >
> > > > > -#ifndef _ISP1760_REGS_H_
> > > > > -#define _ISP1760_REGS_H_
> > > > > +#ifndef _ISP176x_REGS_H_
> > > > > +#define _ISP176x_REGS_H_
> > > > > +
> > > > > +#include <linux/regmap.h>
> > > > >
> > > > > /* -----------------------------------------------------------------------------
> > > > > * Host Controller
> > > > > */
> > > > >
> > > > > /* EHCI capability registers */
> > > > > -#define HC_CAPLENGTH 0x000
> > > > > -#define HC_LENGTH(p) (((p) >> 00) & 0x00ff) /* bits 7:0 */
> > > > > -#define HC_VERSION(p) (((p) >> 16) & 0xffff) /* bits 31:16 */
> > > > > -
> > > > > -#define HC_HCSPARAMS 0x004
> > > > > -#define HCS_INDICATOR(p) ((p) & (1 << 16)) /* true: has port indicators */
> > > > > -#define HCS_PPC(p) ((p) & (1 << 4)) /* true: port power control */
> > > > > -#define HCS_N_PORTS(p) (((p) >> 0) & 0xf) /* bits 3:0, ports on HC */
> > > > > -
> > > > > -#define HC_HCCPARAMS 0x008
> > > > > -#define HCC_ISOC_CACHE(p) ((p) & (1 << 7)) /* true: can cache isoc frame */
> > > > > -#define HCC_ISOC_THRES(p) (((p) >> 4) & 0x7) /* bits 6:4, uframes cached */
> > > > > +#define ISP176x_HC_CAPLENGTH 0x000
> > > > > +#define ISP176x_HC_VERSION 0x002
> > > > > +#define ISP176x_HC_HCSPARAMS 0x004
> > > > > +#define ISP176x_HC_HCCPARAMS 0x008
> > > > >
> > > > > /* EHCI operational registers */
> > > > > -#define HC_USBCMD 0x020
> > > > > -#define CMD_LRESET (1 << 7) /* partial reset (no ports, etc) */
> > > > > -#define CMD_RESET (1 << 1) /* reset HC not bus */
> > > > > -#define CMD_RUN (1 << 0) /* start/stop HC */
> > > > > -
> > > > > -#define HC_USBSTS 0x024
> > > > > -#define STS_PCD (1 << 2) /* port change detect */
> > > > > -
> > > > > -#define HC_FRINDEX 0x02c
> > > > > -
> > > > > -#define HC_CONFIGFLAG 0x060
> > > > > -#define FLAG_CF (1 << 0) /* true: we'll support "high speed" */
> > > > > -
> > > > > -#define HC_PORTSC1 0x064
> > > > > -#define PORT_OWNER (1 << 13) /* true: companion hc owns this port */
> > > > > -#define PORT_POWER (1 << 12) /* true: has power (see PPC) */
> > > > > -#define PORT_USB11(x) (((x) & (3 << 10)) == (1 << 10)) /* USB 1.1 device */
> > > > > -#define PORT_RESET (1 << 8) /* reset port */
> > > > > -#define PORT_SUSPEND (1 << 7) /* suspend port */
> > > > > -#define PORT_RESUME (1 << 6) /* resume it */
> > > > > -#define PORT_PE (1 << 2) /* port enable */
> > > > > -#define PORT_CSC (1 << 1) /* connect status change */
> > > > > -#define PORT_CONNECT (1 << 0) /* device connected */
> > > > > -#define PORT_RWC_BITS (PORT_CSC)
> > > > > -
> > > > > -#define HC_ISO_PTD_DONEMAP_REG 0x130
> > > > > -#define HC_ISO_PTD_SKIPMAP_REG 0x134
> > > > > -#define HC_ISO_PTD_LASTPTD_REG 0x138
> > > > > -#define HC_INT_PTD_DONEMAP_REG 0x140
> > > > > -#define HC_INT_PTD_SKIPMAP_REG 0x144
> > > > > -#define HC_INT_PTD_LASTPTD_REG 0x148
> > > > > -#define HC_ATL_PTD_DONEMAP_REG 0x150
> > > > > -#define HC_ATL_PTD_SKIPMAP_REG 0x154
> > > > > -#define HC_ATL_PTD_LASTPTD_REG 0x158
> > > > > +#define ISP176x_HC_USBCMD 0x020
> > > > > +#define ISP176x_HC_USBSTS 0x024
> > > > > +#define ISP176x_HC_FRINDEX 0x02c
> > > > > +
> > > > > +#define ISP176x_HC_CONFIGFLAG 0x060
> > > > > +#define ISP176x_HC_PORTSC1 0x064
> > > > > +
> > > > > +#define ISP176x_HC_ISO_PTD_DONEMAP 0x130
> > > > > +#define ISP176x_HC_ISO_PTD_SKIPMAP 0x134
> > > > > +#define ISP176x_HC_ISO_PTD_LASTPTD 0x138
> > > > > +#define ISP176x_HC_INT_PTD_DONEMAP 0x140
> > > > > +#define ISP176x_HC_INT_PTD_SKIPMAP 0x144
> > > > > +#define ISP176x_HC_INT_PTD_LASTPTD 0x148
> > > > > +#define ISP176x_HC_ATL_PTD_DONEMAP 0x150
> > > > > +#define ISP176x_HC_ATL_PTD_SKIPMAP 0x154
> > > > > +#define ISP176x_HC_ATL_PTD_LASTPTD 0x158
> > > > >
> > > > > /* Configuration Register */
> > > > > -#define HC_HW_MODE_CTRL 0x300
> > > > > -#define ALL_ATX_RESET (1 << 31)
> > > > > -#define HW_ANA_DIGI_OC (1 << 15)
> > > > > -#define HW_DEV_DMA (1 << 11)
> > > > > -#define HW_COMN_IRQ (1 << 10)
> > > > > -#define HW_COMN_DMA (1 << 9)
> > > > > -#define HW_DATA_BUS_32BIT (1 << 8)
> > > > > -#define HW_DACK_POL_HIGH (1 << 6)
> > > > > -#define HW_DREQ_POL_HIGH (1 << 5)
> > > > > -#define HW_INTR_HIGH_ACT (1 << 2)
> > > > > -#define HW_INTR_EDGE_TRIG (1 << 1)
> > > > > -#define HW_GLOBAL_INTR_EN (1 << 0)
> > > > > -
> > > > > -#define HC_CHIP_ID_REG 0x304
> > > > > -#define HC_SCRATCH_REG 0x308
> > > > > -
> > > > > -#define HC_RESET_REG 0x30c
> > > > > -#define SW_RESET_RESET_HC (1 << 1)
> > > > > -#define SW_RESET_RESET_ALL (1 << 0)
> > > > > -
> > > > > -#define HC_BUFFER_STATUS_REG 0x334
> > > > > -#define ISO_BUF_FILL (1 << 2)
> > > > > -#define INT_BUF_FILL (1 << 1)
> > > > > -#define ATL_BUF_FILL (1 << 0)
> > > > > -
> > > > > -#define HC_MEMORY_REG 0x33c
> > > > > -#define ISP_BANK(x) ((x) << 16)
> > > > > -
> > > > > -#define HC_PORT1_CTRL 0x374
> > > > > -#define PORT1_POWER (3 << 3)
> > > > > -#define PORT1_INIT1 (1 << 7)
> > > > > -#define PORT1_INIT2 (1 << 23)
> > > > > -#define HW_OTG_CTRL_SET 0x374
> > > > > -#define HW_OTG_CTRL_CLR 0x376
> > > > > -#define HW_OTG_DISABLE (1 << 10)
> > > > > -#define HW_OTG_SE0_EN (1 << 9)
> > > > > -#define HW_BDIS_ACON_EN (1 << 8)
> > > > > -#define HW_SW_SEL_HC_DC (1 << 7)
> > > > > -#define HW_VBUS_CHRG (1 << 6)
> > > > > -#define HW_VBUS_DISCHRG (1 << 5)
> > > > > -#define HW_VBUS_DRV (1 << 4)
> > > > > -#define HW_SEL_CP_EXT (1 << 3)
> > > > > -#define HW_DM_PULLDOWN (1 << 2)
> > > > > -#define HW_DP_PULLDOWN (1 << 1)
> > > > > -#define HW_DP_PULLUP (1 << 0)
> > > > > +#define ISP176x_HC_HW_MODE_CTRL 0x300
> > > > > +#define ISP176x_HC_CHIP_ID 0x304
> > > > > +#define ISP176x_HC_SCRATCH 0x308
> > > > > +#define ISP176x_HC_RESET 0x30c
> > > > > +#define ISP176x_HC_BUFFER_STATUS 0x334
> > > > > +#define ISP176x_HC_MEMORY 0x33c
> > > > >
> > > > > /* Interrupt Register */
> > > > > -#define HC_INTERRUPT_REG 0x310
> > > > > -
> > > > > -#define HC_INTERRUPT_ENABLE 0x314
> > > > > -#define HC_ISO_INT (1 << 9)
> > > > > -#define HC_ATL_INT (1 << 8)
> > > > > -#define HC_INTL_INT (1 << 7)
> > > > > -#define HC_EOT_INT (1 << 3)
> > > > > -#define HC_SOT_INT (1 << 1)
> > > > > -#define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT)
> > > > > -
> > > > > -#define HC_ISO_IRQ_MASK_OR_REG 0x318
> > > > > -#define HC_INT_IRQ_MASK_OR_REG 0x31c
> > > > > -#define HC_ATL_IRQ_MASK_OR_REG 0x320
> > > > > -#define HC_ISO_IRQ_MASK_AND_REG 0x324
> > > > > -#define HC_INT_IRQ_MASK_AND_REG 0x328
> > > > > -#define HC_ATL_IRQ_MASK_AND_REG 0x32c
> > > > > +#define ISP176x_HC_INTERRUPT 0x310
> > > > > +#define ISP176x_HC_INTERRUPT_ENABLE 0x314
> > > > > +#define ISP176x_HC_ISO_IRQ_MASK_OR 0x318
> > > > > +#define ISP176x_HC_INT_IRQ_MASK_OR 0x31c
> > > > > +#define ISP176x_HC_ATL_IRQ_MASK_OR 0x320
> > > > > +#define ISP176x_HC_ISO_IRQ_MASK_AND 0x324
> > > > > +#define ISP176x_HC_INT_IRQ_MASK_AND 0x328
> > > > > +#define ISP176x_HC_ATL_IRQ_MASK_AND 0x32c
> > > > > +
> > > > > +static const struct regmap_range isp176x_hc_volatile_ranges[] = {
> > > > > + regmap_reg_range(ISP176x_HC_USBCMD, ISP176x_HC_ATL_PTD_LASTPTD),
> > > > > + regmap_reg_range(ISP176x_HC_BUFFER_STATUS, ISP176x_HC_MEMORY),
> > > > > + regmap_reg_range(ISP176x_HC_INTERRUPT, ISP176x_HC_ATL_IRQ_MASK_AND),
> > > > > +};
> > > > > +
> > > > > +static const struct regmap_access_table isp176x_hc_volatile_table = {
> > > > > + .yes_ranges = isp176x_hc_volatile_ranges,
> > > > > + .n_yes_ranges = ARRAY_SIZE(isp176x_hc_volatile_ranges),
> > > > > +};
> > > >
> > > > These belong to a .c file.
> > >
> > > yup, can move them and all below.
> > >
> > > >
> > > > > +
> > > > > +enum isp176x_host_controller_fields {
> > > > > + /* HC_HCSPARAMS */
> > > > > + HCS_PPC, HCS_N_PORTS,
> > > > > + /* HC_HCCPARAMS */
> > > > > + HCC_ISOC_CACHE, HCC_ISOC_THRES,
> > > > > + /* HC_USBCMD */
> > > > > + CMD_LRESET, CMD_RESET, CMD_RUN,
> > > > > + /* HC_USBSTS */
> > > > > + STS_PCD,
> > > > > + /* HC_FRINDEX */
> > > > > + HC_FRINDEX,
> > > > > + /* HC_CONFIGFLAG */
> > > > > + FLAG_CF,
> > > > > + /* HC_PORTSC1 */
> > > > > + PORT_OWNER, PORT_POWER, PORT_LSTATUS, PORT_RESET, PORT_SUSPEND,
> > > > > + PORT_RESUME, PORT_PE, PORT_CSC, PORT_CONNECT,
> > > > > + /* HC_HW_MODE_CTRL */
> > > > > + ALL_ATX_RESET, HW_ANA_DIGI_OC, HW_DEV_DMA, HW_COMN_IRQ, HW_COMN_DMA,
> > > > > + HW_DATA_BUS_WIDTH, HW_DACK_POL_HIGH, HW_DREQ_POL_HIGH, HW_INTR_HIGH_ACT,
> > > > > + HW_INTR_EDGE_TRIG, HW_GLOBAL_INTR_EN,
> > > > > + /* HC_RESET */
> > > > > + SW_RESET_RESET_HC, SW_RESET_RESET_ALL,
> > > > > + /* HC_BUFFER_STATUS */
> > > > > + INT_BUF_FILL, ATL_BUF_FILL,
> > > > > + /* HC_MEMORY */
> > > > > + MEM_BANK_SEL, MEM_START_ADDR,
> > > > > + /* HC_INTERRUPT_ENABLE */
> > > > > + HC_INT_ENABLE,
> > > > > + /* Last element */
> > > > > + HC_FIELD_MAX,
> > > > > +};
> > > > > +
> > > > > +static const struct reg_field isp1760_hc_reg_fields[] = {
> > > > > + [HCS_PPC] = REG_FIELD(ISP176x_HC_HCSPARAMS, 4, 4),
> > > > > + [HCS_N_PORTS] = REG_FIELD(ISP176x_HC_HCSPARAMS, 0, 3),
> > > > > + [HCC_ISOC_CACHE] = REG_FIELD(ISP176x_HC_HCCPARAMS, 7, 7),
> > > > > + [HCC_ISOC_THRES] = REG_FIELD(ISP176x_HC_HCCPARAMS, 4, 6),
> > > > > + [CMD_LRESET] = REG_FIELD(ISP176x_HC_USBCMD, 7, 7),
> > > > > + [CMD_RESET] = REG_FIELD(ISP176x_HC_USBCMD, 1, 1),
> > > > > + [CMD_RUN] = REG_FIELD(ISP176x_HC_USBCMD, 0, 0),
> > > > > + [STS_PCD] = REG_FIELD(ISP176x_HC_USBSTS, 2, 2),
> > > > > + [HC_FRINDEX] = REG_FIELD(ISP176x_HC_FRINDEX, 0, 13),
> > > > > + [FLAG_CF] = REG_FIELD(ISP176x_HC_CONFIGFLAG, 0, 0),
> > > > > + [PORT_OWNER] = REG_FIELD(ISP176x_HC_PORTSC1, 13, 13),
> > > > > + [PORT_POWER] = REG_FIELD(ISP176x_HC_PORTSC1, 12, 12),
> > > > > + [PORT_LSTATUS] = REG_FIELD(ISP176x_HC_PORTSC1, 10, 11),
> > > > > + [PORT_RESET] = REG_FIELD(ISP176x_HC_PORTSC1, 8, 8),
> > > > > + [PORT_SUSPEND] = REG_FIELD(ISP176x_HC_PORTSC1, 7, 7),
> > > > > + [PORT_RESUME] = REG_FIELD(ISP176x_HC_PORTSC1, 6, 6),
> > > > > + [PORT_PE] = REG_FIELD(ISP176x_HC_PORTSC1, 2, 2),
> > > > > + [PORT_CSC] = REG_FIELD(ISP176x_HC_PORTSC1, 1, 1),
> > > > > + [PORT_CONNECT] = REG_FIELD(ISP176x_HC_PORTSC1, 0, 0),
> > > > > + [ALL_ATX_RESET] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 31, 31),
> > > > > + [HW_ANA_DIGI_OC] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 15, 15),
> > > > > + [HW_COMN_IRQ] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 10, 10),
> > > > > + [HW_DATA_BUS_WIDTH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 8, 8),
> > > > > + [HW_DACK_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 6, 6),
> > > > > + [HW_DREQ_POL_HIGH] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 5, 5),
> > > > > + [HW_INTR_HIGH_ACT] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 2, 2),
> > > > > + [HW_INTR_EDGE_TRIG] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 1, 1),
> > > > > + [HW_GLOBAL_INTR_EN] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 0, 0),
> > > > > + [SW_RESET_RESET_ALL] = REG_FIELD(ISP176x_HC_RESET, 0, 0),
> > > > > + [INT_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 1, 1),
> > > > > + [ATL_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 0, 0),
> > > > > + [MEM_BANK_SEL] = REG_FIELD(ISP176x_HC_MEMORY, 16, 17),
> > > > > + [MEM_START_ADDR] = REG_FIELD(ISP176x_HC_MEMORY, 0, 15),
> > > > > + [HC_INT_ENABLE] = REG_FIELD(ISP176x_HC_INTERRUPT_ENABLE, 7, 8),
> > > > > +};
> > > >
> > > > This too.
> > > >
> > > > >
> > > > > /* -----------------------------------------------------------------------------
> > > > > * Peripheral Controller
> > > > > */
> > > > >
> > > > > -/* Initialization Registers */
> > > > > -#define DC_ADDRESS 0x0200
> > > > > -#define DC_DEVEN (1 << 7)
> > > > > -
> > > > > -#define DC_MODE 0x020c
> > > > > -#define DC_DMACLKON (1 << 9)
> > > > > -#define DC_VBUSSTAT (1 << 8)
> > > > > -#define DC_CLKAON (1 << 7)
> > > > > -#define DC_SNDRSU (1 << 6)
> > > > > -#define DC_GOSUSP (1 << 5)
> > > > > -#define DC_SFRESET (1 << 4)
> > > > > -#define DC_GLINTENA (1 << 3)
> > > > > -#define DC_WKUPCS (1 << 2)
> > > > > -
> > > > > -#define DC_INTCONF 0x0210
> > > > > -#define DC_CDBGMOD_ACK_NAK (0 << 6)
> > > > > -#define DC_CDBGMOD_ACK (1 << 6)
> > > > > -#define DC_CDBGMOD_ACK_1NAK (2 << 6)
> > > > > -#define DC_DDBGMODIN_ACK_NAK (0 << 4)
> > > > > -#define DC_DDBGMODIN_ACK (1 << 4)
> > > > > -#define DC_DDBGMODIN_ACK_1NAK (2 << 4)
> > > > > -#define DC_DDBGMODOUT_ACK_NYET_NAK (0 << 2)
> > > > > -#define DC_DDBGMODOUT_ACK_NYET (1 << 2)
> > > > > -#define DC_DDBGMODOUT_ACK_NYET_1NAK (2 << 2)
> > > > > -#define DC_INTLVL (1 << 1)
> > > > > -#define DC_INTPOL (1 << 0)
> > > > > -
> > > > > -#define DC_DEBUG 0x0212
> > > > > -#define DC_INTENABLE 0x0214
> > > > > #define DC_IEPTX(n) (1 << (11 + 2 * (n)))
> > > > > #define DC_IEPRX(n) (1 << (10 + 2 * (n)))
> > > > > #define DC_IEPRXTX(n) (3 << (10 + 2 * (n)))
> > > > > -#define DC_IEP0SETUP (1 << 8)
> > > > > -#define DC_IEVBUS (1 << 7)
> > > > > -#define DC_IEDMA (1 << 6)
> > > > > -#define DC_IEHS_STA (1 << 5)
> > > > > -#define DC_IERESM (1 << 4)
> > > > > -#define DC_IESUSP (1 << 3)
> > > > > -#define DC_IEPSOF (1 << 2)
> > > > > -#define DC_IESOF (1 << 1)
> > > > > -#define DC_IEBRST (1 << 0)
> > > > > +
> > > > > +#define ISP176x_DC_ENDPTYP_ISOC 0x01
> > > > > +#define ISP176x_DC_ENDPTYP_BULK 0x02
> > > > > +#define ISP176x_DC_ENDPTYP_INTERRUPT 0x03
> > > > > +
> > > > > +/* Initialization Registers */
> > > > > +#define ISP176x_DC_ADDRESS 0x0200
> > > > > +#define ISP176x_DC_MODE 0x020c
> > > > > +#define ISP176x_DC_INTCONF 0x0210
> > > > > +#define ISP176x_DC_DEBUG 0x0212
> > > > > +#define ISP176x_DC_INTENABLE 0x0214
> > > > >
> > > > > /* Data Flow Registers */
> > > > > -#define DC_EPINDEX 0x022c
> > > > > -#define DC_EP0SETUP (1 << 5)
> > > > > -#define DC_ENDPIDX(n) ((n) << 1)
> > > > > -#define DC_EPDIR (1 << 0)
> > > > > -
> > > > > -#define DC_CTRLFUNC 0x0228
> > > > > -#define DC_CLBUF (1 << 4)
> > > > > -#define DC_VENDP (1 << 3)
> > > > > -#define DC_DSEN (1 << 2)
> > > > > -#define DC_STATUS (1 << 1)
> > > > > -#define DC_STALL (1 << 0)
> > > > > -
> > > > > -#define DC_DATAPORT 0x0220
> > > > > -#define DC_BUFLEN 0x021c
> > > > > -#define DC_DATACOUNT_MASK 0xffff
> > > > > -#define DC_BUFSTAT 0x021e
> > > > > -#define DC_EPMAXPKTSZ 0x0204
> > > > > -
> > > > > -#define DC_EPTYPE 0x0208
> > > > > -#define DC_NOEMPKT (1 << 4)
> > > > > -#define DC_EPENABLE (1 << 3)
> > > > > -#define DC_DBLBUF (1 << 2)
> > > > > -#define DC_ENDPTYP_ISOC (1 << 0)
> > > > > -#define DC_ENDPTYP_BULK (2 << 0)
> > > > > -#define DC_ENDPTYP_INTERRUPT (3 << 0)
> > > > > +#define ISP176x_DC_EPMAXPKTSZ 0x0204
> > > > > +#define ISP176x_DC_EPTYPE 0x0208
> > > > > +
> > > > > +#define ISP176x_DC_BUFLEN 0x021c
> > > > > +#define ISP176x_DC_BUFSTAT 0x021e
> > > > > +#define ISP176x_DC_DATAPORT 0x0220
> > > > > +
> > > > > +#define ISP176x_DC_CTRLFUNC 0x0228
> > > > > +#define ISP176x_DC_EPINDEX 0x022c
> > > > > +
> > > > > +#define ISP1761_DC_OTG_CTRL_SET 0x374
> > > > > +#define ISP1761_DC_OTG_CTRL_CLEAR 0x376
> > > > >
> > > > > /* DMA Registers */
> > > > > -#define DC_DMACMD 0x0230
> > > > > -#define DC_DMATXCOUNT 0x0234
> > > > > -#define DC_DMACONF 0x0238
> > > > > -#define DC_DMAHW 0x023c
> > > > > -#define DC_DMAINTREASON 0x0250
> > > > > -#define DC_DMAINTEN 0x0254
> > > > > -#define DC_DMAEP 0x0258
> > > > > -#define DC_DMABURSTCOUNT 0x0264
> > > > > +#define ISP176x_DC_DMACMD 0x0230
> > > > > +#define ISP176x_DC_DMATXCOUNT 0x0234
> > > > > +#define ISP176x_DC_DMACONF 0x0238
> > > > > +#define ISP176x_DC_DMAHW 0x023c
> > > > > +#define ISP176x_DC_DMAINTREASON 0x0250
> > > > > +#define ISP176x_DC_DMAINTEN 0x0254
> > > > > +#define ISP176x_DC_DMAEP 0x0258
> > > > > +#define ISP176x_DC_DMABURSTCOUNT 0x0264
> > > > >
> > > > > /* General Registers */
> > > > > -#define DC_INTERRUPT 0x0218
> > > > > -#define DC_CHIPID 0x0270
> > > > > -#define DC_FRAMENUM 0x0274
> > > > > -#define DC_SCRATCH 0x0278
> > > > > -#define DC_UNLOCKDEV 0x027c
> > > > > -#define DC_INTPULSEWIDTH 0x0280
> > > > > -#define DC_TESTMODE 0x0284
> > > > > +#define ISP176x_DC_INTERRUPT 0x0218
> > > > > +#define ISP176x_DC_CHIPID 0x0270
> > > > > +#define ISP176x_DC_FRAMENUM 0x0274
> > > > > +#define ISP176x_DC_SCRATCH 0x0278
> > > > > +#define ISP176x_DC_UNLOCKDEV 0x027c
> > > > > +#define ISP176x_DC_INTPULSEWIDTH 0x0280
> > > > > +#define ISP176x_DC_TESTMODE 0x0284
> > > > > +
> > > > > +static const struct regmap_range isp176x_dc_volatile_ranges[] = {
> > > > > + regmap_reg_range(ISP176x_DC_EPMAXPKTSZ, ISP176x_DC_EPTYPE),
> > > > > + regmap_reg_range(ISP176x_DC_BUFLEN, ISP176x_DC_EPINDEX),
> > > > > + regmap_reg_range(ISP1761_DC_OTG_CTRL_SET, ISP1761_DC_OTG_CTRL_CLEAR),
> > > > > +};
> > > > > +
> > > > > +static const struct regmap_access_table isp176x_dc_volatile_table = {
> > > > > + .yes_ranges = isp176x_dc_volatile_ranges,
> > > > > + .n_yes_ranges = ARRAY_SIZE(isp176x_dc_volatile_ranges),
> > > > > +};
> > > > > +
> > > > > +enum isp176x_device_controller_fields {
> > > > > + /* DC_ADDRESS */
> > > > > + DC_DEVEN, DC_DEVADDR,
> > > > > + /* DC_MODE */
> > > > > + DC_VBUSSTAT, DC_SFRESET, DC_GLINTENA,
> > > > > + /* DC_INTCONF */
> > > > > + DC_CDBGMOD_ACK, DC_DDBGMODIN_ACK, DC_DDBGMODOUT_ACK, DC_INTPOL,
> > > > > + /* DC_INTENABLE */
> > > > > + DC_IEPRXTX_7, DC_IEPRXTX_6, DC_IEPRXTX_5, DC_IEPRXTX_4, DC_IEPRXTX_3,
> > > > > + DC_IEPRXTX_2, DC_IEPRXTX_1, DC_IEPRXTX_0,
> > > > > + DC_IEP0SETUP, DC_IEVBUS, DC_IEHS_STA, DC_IERESM, DC_IESUSP, DC_IEBRST,
> > > > > + /* DC_EPINDEX */
> > > > > + DC_EP0SETUP, DC_ENDPIDX, DC_EPDIR,
> > > > > + /* DC_CTRLFUNC */
> > > > > + DC_CLBUF, DC_VENDP, DC_DSEN, DC_STATUS, DC_STALL,
> > > > > + /* DC_BUFLEN */
> > > > > + DC_BUFLEN,
> > > > > + /* DC_EPMAXPKTSZ */
> > > > > + DC_FFOSZ,
> > > > > + /* DC_EPTYPE */
> > > > > + DC_EPENABLE, DC_ENDPTYP,
> > > > > + /* DC_FRAMENUM */
> > > > > + DC_FRAMENUM, DC_UFRAMENUM,
> > > > > + /* HW_OTG_CTRL_SET */
> > > > > + HW_OTG_DISABLE, HW_SW_SEL_HC_DC, HW_VBUS_DRV, HW_SEL_CP_EXT,
> > > > > + HW_DM_PULLDOWN, HW_DP_PULLDOWN, HW_DP_PULLUP,
> > > > > + /* HW_OTG_CTRL_CLR */
> > > > > + HW_OTG_DISABLE_CLEAR, HW_SW_SEL_HC_DC_CLEAR, HW_VBUS_DRV_CLEAR,
> > > > > + HW_SEL_CP_EXT_CLEAR, HW_DM_PULLDOWN_CLEAR, HW_DP_PULLDOWN_CLEAR,
> > > > > + HW_DP_PULLUP_CLEAR,
> > > > > + /* Last element */
> > > > > + DC_FIELD_MAX,
> > > > > +};
> > > > > +
> > > > > +static const struct reg_field isp1761_dc_reg_fields[] = {
> > > > > + [DC_DEVEN] = REG_FIELD(ISP176x_DC_ADDRESS, 7, 7),
> > > > > + [DC_DEVADDR] = REG_FIELD(ISP176x_DC_ADDRESS, 0, 6),
> > > > > + [DC_VBUSSTAT] = REG_FIELD(ISP176x_DC_MODE, 8, 8),
> > > > > + [DC_SFRESET] = REG_FIELD(ISP176x_DC_MODE, 4, 4),
> > > > > + [DC_GLINTENA] = REG_FIELD(ISP176x_DC_MODE, 3, 3),
> > > > > + [DC_CDBGMOD_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 6, 6),
> > > > > + [DC_DDBGMODIN_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 4, 4),
> > > > > + [DC_DDBGMODOUT_ACK] = REG_FIELD(ISP176x_DC_INTCONF, 2, 2),
> > > > > + [DC_INTPOL] = REG_FIELD(ISP176x_DC_INTCONF, 0, 0),
> > > > > + [DC_IEPRXTX_7] = REG_FIELD(ISP176x_DC_INTENABLE, 25, 25),
> > > > > + [DC_IEPRXTX_6] = REG_FIELD(ISP176x_DC_INTENABLE, 23, 23),
> > > > > + [DC_IEPRXTX_5] = REG_FIELD(ISP176x_DC_INTENABLE, 21, 21),
> > > > > + [DC_IEPRXTX_4] = REG_FIELD(ISP176x_DC_INTENABLE, 19, 19),
> > > > > + [DC_IEPRXTX_3] = REG_FIELD(ISP176x_DC_INTENABLE, 17, 17),
> > > > > + [DC_IEPRXTX_2] = REG_FIELD(ISP176x_DC_INTENABLE, 15, 15),
> > > > > + [DC_IEPRXTX_1] = REG_FIELD(ISP176x_DC_INTENABLE, 13, 13),
> > > > > + [DC_IEPRXTX_0] = REG_FIELD(ISP176x_DC_INTENABLE, 11, 11),
> > > > > + [DC_IEP0SETUP] = REG_FIELD(ISP176x_DC_INTENABLE, 8, 8),
> > > > > + [DC_IEVBUS] = REG_FIELD(ISP176x_DC_INTENABLE, 7, 7),
> > > > > + [DC_IEHS_STA] = REG_FIELD(ISP176x_DC_INTENABLE, 5, 5),
> > > > > + [DC_IERESM] = REG_FIELD(ISP176x_DC_INTENABLE, 4, 4),
> > > > > + [DC_IESUSP] = REG_FIELD(ISP176x_DC_INTENABLE, 3, 3),
> > > > > + [DC_IEBRST] = REG_FIELD(ISP176x_DC_INTENABLE, 0, 0),
> > > > > + [DC_EP0SETUP] = REG_FIELD(ISP176x_DC_EPINDEX, 5, 5),
> > > > > + [DC_ENDPIDX] = REG_FIELD(ISP176x_DC_EPINDEX, 1, 4),
> > > > > + [DC_EPDIR] = REG_FIELD(ISP176x_DC_EPINDEX, 0, 0),
> > > > > + [DC_CLBUF] = REG_FIELD(ISP176x_DC_CTRLFUNC, 4, 4),
> > > > > + [DC_VENDP] = REG_FIELD(ISP176x_DC_CTRLFUNC, 3, 3),
> > > > > + [DC_DSEN] = REG_FIELD(ISP176x_DC_CTRLFUNC, 2, 2),
> > > > > + [DC_STATUS] = REG_FIELD(ISP176x_DC_CTRLFUNC, 1, 1),
> > > > > + [DC_STALL] = REG_FIELD(ISP176x_DC_CTRLFUNC, 0, 0),
> > > > > + [DC_BUFLEN] = REG_FIELD(ISP176x_DC_BUFLEN, 0, 15),
> > > > > + [DC_FFOSZ] = REG_FIELD(ISP176x_DC_EPMAXPKTSZ, 0, 10),
> > > > > + [DC_EPENABLE] = REG_FIELD(ISP176x_DC_EPTYPE, 3, 3),
> > > > > + [DC_ENDPTYP] = REG_FIELD(ISP176x_DC_EPTYPE, 0, 1),
> > > > > + [DC_UFRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 11, 13),
> > > > > + [DC_FRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 0, 10),
> > > > > + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 10, 10),
> > > > > + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 7, 7),
> > > > > + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 4, 4),
> > > > > + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 3, 3),
> > > > > + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 2, 2),
> > > > > + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 1, 1),
> > > > > + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 0, 0),
> > > > > + [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 10, 10),
> > > > > + [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 7, 7),
> > > > > + [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 4, 4),
> > > > > + [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 3, 3),
> > > > > + [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 2, 2),
> > > > > + [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 1, 1),
> > > > > + [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 0, 0),
> > > > > +};
> > > > >
> > > > > #endif
> > > > > diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
> > > > > index 1714b2258b54..1ce21ef291b6 100644
> > > > > --- a/drivers/usb/isp1760/isp1760-udc.c
> > > > > +++ b/drivers/usb/isp1760/isp1760-udc.c
> > > > > @@ -45,16 +45,62 @@ static inline struct isp1760_request *req_to_udc_req(struct usb_request *req)
> > > > > return container_of(req, struct isp1760_request, req);
> > > > > }
> > > > >
> > > > > -static inline u32 isp1760_udc_read(struct isp1760_udc *udc, u16 reg)
> > > > > +static u32 isp1760_udc_read(struct isp1760_udc *udc, u16 field)
> > > > > {
> > > > > - return isp1760_read32(udc->regs, reg);
> > > > > + return isp1760_field_read(udc->fields, field);
> > > > > }
> > > > >
> > > > > -static inline void isp1760_udc_write(struct isp1760_udc *udc, u16 reg, u32 val)
> > > > > +static void isp1760_udc_write(struct isp1760_udc *udc, u16 field, u32 val)
> > > > > {
> > > > > - isp1760_write32(udc->regs, reg, val);
> > > > > + isp1760_field_write(udc->fields, field, val);
> > > > > }
> > > > >
> > > > > +static u32 isp1760_udc_read_raw(struct isp1760_udc *udc, u16 reg)
> > > > > +{
> > > > > + u32 val;
> > > > > +
> > > > > + regmap_raw_read(udc->regs, reg, &val, 4);
> > > > > +
> > > > > + return le32_to_cpu(val);
> > > > > +}
> > > > > +
> > > > > +static u16 isp1760_udc_read_raw16(struct isp1760_udc *udc, u16 reg)
> > > > > +{
> > > > > + u16 val;
> > > > > +
> > > > > + regmap_raw_read(udc->regs, reg, &val, 2);
> > > > > +
> > > > > + return le16_to_cpu(val);
> > > > > +}
> > > > > +
> > > > > +static void isp1760_udc_write_raw(struct isp1760_udc *udc, u16 reg, u32 val)
> > > > > +{
> > > > > + val = cpu_to_le32(val);
> > > > > +
> > > > > + regmap_raw_write(udc->regs, reg, &val, 4);
> > > > > +}
> > > > > +
> > > > > +static void isp1760_udc_write_raw16(struct isp1760_udc *udc, u16 reg, u16 val)
> > > > > +{
> > > > > + val = cpu_to_le16(val);
> > > > > +
> > > > > + regmap_raw_write(udc->regs, reg, &val, 2);
> > > > > +}
> > > > > +
> > > > > +static void isp1760_udc_set(struct isp1760_udc *udc, u32 field)
> > > > > +{
> > > > > + isp1760_udc_write(udc, field, 0xFFFFFFFF);
> > > > > +}
> > > > > +
> > > > > +static void isp1760_udc_clear(struct isp1760_udc *udc, u32 field)
> > > > > +{
> > > > > + isp1760_udc_write(udc, field, 0);
> > > > > +}
> > > > > +
> > > > > +static bool isp1760_udc_is_set(struct isp1760_udc *udc, u32 field)
> > > > > +{
> > > > > + return !!isp1760_udc_read(udc, field);
> > > > > +}
> > > > > /* -----------------------------------------------------------------------------
> > > > > * Endpoint Management
> > > > > */
> > > > > @@ -75,11 +121,15 @@ static struct isp1760_ep *isp1760_udc_find_ep(struct isp1760_udc *udc,
> > > > > return NULL;
> > > > > }
> > > > >
> > > > > -static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> > > > > +static void __isp1760_udc_select_ep(struct isp1760_udc *udc,
> > > > > + struct isp1760_ep *ep, int dir)
> > > > > {
> > > > > - isp1760_udc_write(ep->udc, DC_EPINDEX,
> > > > > - DC_ENDPIDX(ep->addr & USB_ENDPOINT_NUMBER_MASK) |
> > > > > - (dir == USB_DIR_IN ? DC_EPDIR : 0));
> > > > > + isp1760_udc_write(udc, DC_ENDPIDX, ep->addr & USB_ENDPOINT_NUMBER_MASK);
> > > > > +
> > > > > + if (dir == USB_DIR_IN)
> > > > > + isp1760_udc_set(udc, DC_EPDIR);
> > > > > + else
> > > > > + isp1760_udc_clear(udc, DC_EPDIR);
> > > > > }
> > > > >
> > > > > /**
> > > > > @@ -93,9 +143,10 @@ static void __isp1760_udc_select_ep(struct isp1760_ep *ep, int dir)
> > > > > *
> > > > > * Called with the UDC spinlock held.
> > > > > */
> > > > > -static void isp1760_udc_select_ep(struct isp1760_ep *ep)
> > > > > +static void isp1760_udc_select_ep(struct isp1760_udc *udc,
> > > > > + struct isp1760_ep *ep)
> > > > > {
> > > > > - __isp1760_udc_select_ep(ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> > > > > + __isp1760_udc_select_ep(udc, ep, ep->addr & USB_ENDPOINT_DIR_MASK);
> > > > > }
> > > > >
> > > > > /* Called with the UDC spinlock held. */
> > > > > @@ -108,9 +159,13 @@ static void isp1760_udc_ctrl_send_status(struct isp1760_ep *ep, int dir)
> > > > > * the direction opposite to the data stage data packets, we thus need
> > > > > * to select the OUT/IN endpoint for IN/OUT transfers.
> > > > > */
> > > > > - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) |
> > > > > - (dir == USB_DIR_IN ? 0 : DC_EPDIR));
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STATUS);
> > > > > + if (dir == USB_DIR_IN)
> > > > > + isp1760_udc_clear(udc, DC_EPDIR);
> > > > > + else
> > > > > + isp1760_udc_set(udc, DC_EPDIR);
> > > > > +
> > > > > + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> > > > > + isp1760_udc_set(udc, DC_STATUS);
> > > > >
> > > > > /*
> > > > > * The hardware will terminate the request automatically and go back to
> > > > > @@ -157,10 +212,10 @@ static void isp1760_udc_ctrl_send_stall(struct isp1760_ep *ep)
> > > > > spin_lock_irqsave(&udc->lock, flags);
> > > > >
> > > > > /* Stall both the IN and OUT endpoints. */
> > > > > - __isp1760_udc_select_ep(ep, USB_DIR_OUT);
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> > > > > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_STALL);
> > > > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_OUT);
> > > > > + isp1760_udc_set(udc, DC_STALL);
> > > > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > > > > + isp1760_udc_set(udc, DC_STALL);
> > > > >
> > > > > /* A protocol stall completes the control transaction. */
> > > > > udc->ep0_state = ISP1760_CTRL_SETUP;
> > > > > @@ -181,8 +236,8 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > > > > u32 *buf;
> > > > > int i;
> > > > >
> > > > > - isp1760_udc_select_ep(ep);
> > > > > - len = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> > > > > + isp1760_udc_select_ep(udc, ep);
> > > > > + len = isp1760_udc_read(udc, DC_BUFLEN);
> > > > >
> > > > > dev_dbg(udc->isp->dev, "%s: received %u bytes (%u/%u done)\n",
> > > > > __func__, len, req->req.actual, req->req.length);
> > > > > @@ -198,7 +253,7 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > > > > * datasheet doesn't clearly document how this should be
> > > > > * handled.
> > > > > */
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > > > > + isp1760_udc_set(udc, DC_CLBUF);
> > > > > return false;
> > > > > }
> > > > >
> > > > > @@ -209,9 +264,9 @@ static bool isp1760_udc_receive(struct isp1760_ep *ep,
> > > > > * the next packet might be removed from the FIFO.
> > > > > */
> > > > > for (i = len; i > 2; i -= 4, ++buf)
> > > > > - *buf = le32_to_cpu(isp1760_udc_read(udc, DC_DATAPORT));
> > > > > + *buf = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > > > > if (i > 0)
> > > > > - *(u16 *)buf = le16_to_cpu(readw(udc->regs + DC_DATAPORT));
> > > > > + *(u16 *)buf = isp1760_udc_read_raw16(udc, ISP176x_DC_DATAPORT);
> > > > >
> > > > > req->req.actual += len;
> > > > >
> > > > > @@ -253,7 +308,7 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> > > > > __func__, req->packet_size, req->req.actual,
> > > > > req->req.length);
> > > > >
> > > > > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > > > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > > > >
> > > > > if (req->packet_size)
> > > > > isp1760_udc_write(udc, DC_BUFLEN, req->packet_size);
> > > > > @@ -265,14 +320,14 @@ static void isp1760_udc_transmit(struct isp1760_ep *ep,
> > > > > * the FIFO for this kind of conditions, but doesn't seem to work.
> > > > > */
> > > > > for (i = req->packet_size; i > 2; i -= 4, ++buf)
> > > > > - isp1760_udc_write(udc, DC_DATAPORT, cpu_to_le32(*buf));
> > > > > + isp1760_udc_write_raw(udc, ISP176x_DC_DATAPORT, *buf);
> > > > > if (i > 0)
> > > > > - writew(cpu_to_le16(*(u16 *)buf), udc->regs + DC_DATAPORT);
> > > > > + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, *(u16 *)buf);
> > > > >
> > > > > if (ep->addr == 0)
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > > > > + isp1760_udc_set(udc, DC_DSEN);
> > > > > if (!req->packet_size)
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_VENDP);
> > > > > + isp1760_udc_set(udc, DC_VENDP);
> > > > > }
> > > > >
> > > > > static void isp1760_ep_rx_ready(struct isp1760_ep *ep)
> > > > > @@ -408,19 +463,24 @@ static int __isp1760_udc_set_halt(struct isp1760_ep *ep, bool halt)
> > > > > return -EINVAL;
> > > > > }
> > > > >
> > > > > - isp1760_udc_select_ep(ep);
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> > > > > + isp1760_udc_select_ep(udc, ep);
> > > > > +
> > > > > + if (halt)
> > > > > + isp1760_udc_set(udc, DC_STALL);
> > > > > + else
> > > > > + isp1760_udc_clear(udc, DC_STALL);
> > > > >
> > > > > if (ep->addr == 0) {
> > > > > /* When halting the control endpoint, stall both IN and OUT. */
> > > > > - __isp1760_udc_select_ep(ep, USB_DIR_IN);
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, halt ? DC_STALL : 0);
> > > > > + __isp1760_udc_select_ep(udc, ep, USB_DIR_IN);
> > > > > + if (halt)
> > > > > + isp1760_udc_set(udc, DC_STALL);
> > > > > + else
> > > > > + isp1760_udc_clear(udc, DC_STALL);
> > > > > } else if (!halt) {
> > > > > /* Reset the data PID by cycling the endpoint enable bit. */
> > > > > - u16 eptype = isp1760_udc_read(udc, DC_EPTYPE);
> > > > > -
> > > > > - isp1760_udc_write(udc, DC_EPTYPE, eptype & ~DC_EPENABLE);
> > > > > - isp1760_udc_write(udc, DC_EPTYPE, eptype);
> > > > > + isp1760_udc_clear(udc, DC_EPENABLE);
> > > > > + isp1760_udc_set(udc, DC_EPENABLE);
> > > > >
> > > > > /*
> > > > > * Disabling the endpoint emptied the transmit FIFO, fill it
> > > > > @@ -479,12 +539,14 @@ static int isp1760_udc_get_status(struct isp1760_udc *udc,
> > > > > return -EINVAL;
> > > > > }
> > > > >
> > > > > - isp1760_udc_write(udc, DC_EPINDEX, DC_ENDPIDX(0) | DC_EPDIR);
> > > > > + isp1760_udc_set(udc, DC_EPDIR);
> > > > > + isp1760_udc_write(udc, DC_ENDPIDX, 1);
> > > > > +
> > > > > isp1760_udc_write(udc, DC_BUFLEN, 2);
> > > > >
> > > > > - writew(cpu_to_le16(status), udc->regs + DC_DATAPORT);
> > > > > + isp1760_udc_write_raw16(udc, ISP176x_DC_DATAPORT, status);
> > > > >
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > > > > + isp1760_udc_set(udc, DC_DSEN);
> > > > >
> > > > > dev_dbg(udc->isp->dev, "%s: status 0x%04x\n", __func__, status);
> > > > >
> > > > > @@ -508,7 +570,8 @@ static int isp1760_udc_set_address(struct isp1760_udc *udc, u16 addr)
> > > > > usb_gadget_set_state(&udc->gadget, addr ? USB_STATE_ADDRESS :
> > > > > USB_STATE_DEFAULT);
> > > > >
> > > > > - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN | addr);
> > > > > + isp1760_udc_write(udc, DC_DEVADDR, addr);
> > > > > + isp1760_udc_set(udc, DC_DEVEN);
> > > > >
> > > > > spin_lock(&udc->lock);
> > > > > isp1760_udc_ctrl_send_status(&udc->ep[0], USB_DIR_OUT);
> > > > > @@ -650,9 +713,9 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
> > > > >
> > > > > spin_lock(&udc->lock);
> > > > >
> > > > > - isp1760_udc_write(udc, DC_EPINDEX, DC_EP0SETUP);
> > > > > + isp1760_udc_set(udc, DC_EP0SETUP);
> > > > >
> > > > > - count = isp1760_udc_read(udc, DC_BUFLEN) & DC_DATACOUNT_MASK;
> > > > > + count = isp1760_udc_read(udc, DC_BUFLEN);
> > > > > if (count != sizeof(req)) {
> > > > > spin_unlock(&udc->lock);
> > > > >
> > > > > @@ -663,8 +726,8 @@ static void isp1760_ep0_setup(struct isp1760_udc *udc)
> > > > > return;
> > > > > }
> > > > >
> > > > > - req.data[0] = isp1760_udc_read(udc, DC_DATAPORT);
> > > > > - req.data[1] = isp1760_udc_read(udc, DC_DATAPORT);
> > > > > + req.data[0] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > > > > + req.data[1] = isp1760_udc_read_raw(udc, ISP176x_DC_DATAPORT);
> > > > >
> > > > > if (udc->ep0_state != ISP1760_CTRL_SETUP) {
> > > > > spin_unlock(&udc->lock);
> > > > > @@ -732,13 +795,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
> > > > >
> > > > > switch (usb_endpoint_type(desc)) {
> > > > > case USB_ENDPOINT_XFER_ISOC:
> > > > > - type = DC_ENDPTYP_ISOC;
> > > > > + type = ISP176x_DC_ENDPTYP_ISOC;
> > > > > break;
> > > > > case USB_ENDPOINT_XFER_BULK:
> > > > > - type = DC_ENDPTYP_BULK;
> > > > > + type = ISP176x_DC_ENDPTYP_BULK;
> > > > > break;
> > > > > case USB_ENDPOINT_XFER_INT:
> > > > > - type = DC_ENDPTYP_INTERRUPT;
> > > > > + type = ISP176x_DC_ENDPTYP_INTERRUPT;
> > > > > break;
> > > > > case USB_ENDPOINT_XFER_CONTROL:
> > > > > default:
> > > > > @@ -755,10 +818,13 @@ static int isp1760_ep_enable(struct usb_ep *ep,
> > > > > uep->halted = false;
> > > > > uep->wedged = false;
> > > > >
> > > > > - isp1760_udc_select_ep(uep);
> > > > > - isp1760_udc_write(udc, DC_EPMAXPKTSZ, uep->maxpacket);
> > > > > + isp1760_udc_select_ep(udc, uep);
> > > > > +
> > > > > + isp1760_udc_write(udc, DC_FFOSZ, uep->maxpacket);
> > > > > isp1760_udc_write(udc, DC_BUFLEN, uep->maxpacket);
> > > > > - isp1760_udc_write(udc, DC_EPTYPE, DC_EPENABLE | type);
> > > > > +
> > > > > + isp1760_udc_write(udc, DC_ENDPTYP, type);
> > > > > + isp1760_udc_set(udc, DC_EPENABLE);
> > > > >
> > > > > spin_unlock_irqrestore(&udc->lock, flags);
> > > > >
> > > > > @@ -786,8 +852,9 @@ static int isp1760_ep_disable(struct usb_ep *ep)
> > > > > uep->desc = NULL;
> > > > > uep->maxpacket = 0;
> > > > >
> > > > > - isp1760_udc_select_ep(uep);
> > > > > - isp1760_udc_write(udc, DC_EPTYPE, 0);
> > > > > + isp1760_udc_select_ep(udc, uep);
> > > > > + isp1760_udc_clear(udc, DC_EPENABLE);
> > > > > + isp1760_udc_clear(udc, DC_ENDPTYP);
> > > > >
> > > > > /* TODO Synchronize with the IRQ handler */
> > > > >
> > > > > @@ -864,8 +931,8 @@ static int isp1760_ep_queue(struct usb_ep *ep, struct usb_request *_req,
> > > > >
> > > > > case ISP1760_CTRL_DATA_OUT:
> > > > > list_add_tail(&req->queue, &uep->queue);
> > > > > - __isp1760_udc_select_ep(uep, USB_DIR_OUT);
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_DSEN);
> > > > > + __isp1760_udc_select_ep(udc, uep, USB_DIR_OUT);
> > > > > + isp1760_udc_set(udc, DC_DSEN);
> > > > > break;
> > > > >
> > > > > case ISP1760_CTRL_STATUS:
> > > > > @@ -1025,14 +1092,14 @@ static void isp1760_ep_fifo_flush(struct usb_ep *ep)
> > > > >
> > > > > spin_lock_irqsave(&udc->lock, flags);
> > > > >
> > > > > - isp1760_udc_select_ep(uep);
> > > > > + isp1760_udc_select_ep(udc, uep);
> > > > >
> > > > > /*
> > > > > * Set the CLBUF bit twice to flush both buffers in case double
> > > > > * buffering is enabled.
> > > > > */
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > > > > - isp1760_udc_write(udc, DC_CTRLFUNC, DC_CLBUF);
> > > > > + isp1760_udc_set(udc, DC_CLBUF);
> > > > > + isp1760_udc_set(udc, DC_CLBUF);
> > > > >
> > > > > spin_unlock_irqrestore(&udc->lock, flags);
> > > > > }
> > > > > @@ -1091,19 +1158,30 @@ static void isp1760_udc_init_hw(struct isp1760_udc *udc)
> > > > > * ACK tokens only (and NYET for the out pipe). The default
> > > > > * configuration also generates an interrupt on the first NACK token.
> > > > > */
> > > > > - isp1760_udc_write(udc, DC_INTCONF, DC_CDBGMOD_ACK | DC_DDBGMODIN_ACK |
> > > > > - DC_DDBGMODOUT_ACK_NYET);
> > > > > -
> > > > > - isp1760_udc_write(udc, DC_INTENABLE, DC_IEPRXTX(7) | DC_IEPRXTX(6) |
> > > > > - DC_IEPRXTX(5) | DC_IEPRXTX(4) | DC_IEPRXTX(3) |
> > > > > - DC_IEPRXTX(2) | DC_IEPRXTX(1) | DC_IEPRXTX(0) |
> > > > > - DC_IEP0SETUP | DC_IEVBUS | DC_IERESM | DC_IESUSP |
> > > > > - DC_IEHS_STA | DC_IEBRST);
> > > > > + isp1760_udc_set(udc, DC_CDBGMOD_ACK);
> > > > > + isp1760_udc_set(udc, DC_DDBGMODIN_ACK);
> > > > > + isp1760_udc_set(udc, DC_DDBGMODOUT_ACK);
> > > > > +
> > > > > + isp1760_udc_set(udc, DC_IEPRXTX_7);
> > > > > + isp1760_udc_set(udc, DC_IEPRXTX_6);
> > > > > + isp1760_udc_set(udc, DC_IEPRXTX_5);
> > > > > + isp1760_udc_set(udc, DC_IEPRXTX_4);
> > > > > + isp1760_udc_set(udc, DC_IEPRXTX_3);
> > > > > + isp1760_udc_set(udc, DC_IEPRXTX_2);
> > > > > + isp1760_udc_set(udc, DC_IEPRXTX_1);
> > > > > + isp1760_udc_set(udc, DC_IEPRXTX_0);
> > > > > +
> > > > > + isp1760_udc_set(udc, DC_IEP0SETUP);
> > > > > + isp1760_udc_set(udc, DC_IEVBUS);
> > > > > + isp1760_udc_set(udc, DC_IERESM);
> > > > > + isp1760_udc_set(udc, DC_IESUSP);
> > > > > + isp1760_udc_set(udc, DC_IEHS_STA);
> > > > > + isp1760_udc_set(udc, DC_IEBRST);
This is another place I've spotted while casually looking at the patch.
> > > > >
> > > > > if (udc->connected)
> > > > > isp1760_set_pullup(udc->isp, true);
> > > > >
> > > > > - isp1760_udc_write(udc, DC_ADDRESS, DC_DEVEN);
> > > > > + isp1760_udc_set(udc, DC_DEVEN);
> > > > > }
> > > > >
> > > > > static void isp1760_udc_reset(struct isp1760_udc *udc)
> > > > > @@ -1152,7 +1230,7 @@ static int isp1760_udc_get_frame(struct usb_gadget *gadget)
> > > > > {
> > > > > struct isp1760_udc *udc = gadget_to_udc(gadget);
> > > > >
> > > > > - return isp1760_udc_read(udc, DC_FRAMENUM) & ((1 << 11) - 1);
> > > > > + return isp1760_udc_read(udc, DC_FRAMENUM);
> > > > > }
> > > > >
> > > > > static int isp1760_udc_wakeup(struct usb_gadget *gadget)
> > > > > @@ -1219,7 +1297,7 @@ static int isp1760_udc_start(struct usb_gadget *gadget,
> > > > > usb_gadget_set_state(&udc->gadget, USB_STATE_ATTACHED);
> > > > >
> > > > > /* DMA isn't supported yet, don't enable the DMA clock. */
> > > > > - isp1760_udc_write(udc, DC_MODE, DC_GLINTENA);
> > > > > + isp1760_udc_set(udc, DC_GLINTENA);
> > > > >
> > > > > isp1760_udc_init_hw(udc);
> > > > >
> > > > > @@ -1238,7 +1316,7 @@ static int isp1760_udc_stop(struct usb_gadget *gadget)
> > > > >
> > > > > del_timer_sync(&udc->vbus_timer);
> > > > >
> > > > > - isp1760_udc_write(udc, DC_MODE, 0);
> > > > > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > > > >
> > > > > spin_lock_irqsave(&udc->lock, flags);
> > > > > udc->driver = NULL;
> > > > > @@ -1266,9 +1344,9 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> > > > > unsigned int i;
> > > > > u32 status;
> > > > >
> > > > > - status = isp1760_udc_read(udc, DC_INTERRUPT)
> > > > > - & isp1760_udc_read(udc, DC_INTENABLE);
> > > > > - isp1760_udc_write(udc, DC_INTERRUPT, status);
> > > > > + status = isp1760_reg_read(udc->regs, ISP176x_DC_INTERRUPT)
> > > > > + & isp1760_reg_read(udc->regs, ISP176x_DC_INTENABLE);
> > > > > + isp1760_reg_write(udc->regs, ISP176x_DC_INTERRUPT, status);
> > > > >
> > > > > if (status & DC_IEVBUS) {
> > > > > dev_dbg(udc->isp->dev, "%s(VBUS)\n", __func__);
> > > > > @@ -1313,7 +1391,7 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
> > > > > dev_dbg(udc->isp->dev, "%s(SUSP)\n", __func__);
> > > > >
> > > > > spin_lock(&udc->lock);
> > > > > - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> > > > > + if (!isp1760_udc_is_set(udc, DC_VBUSSTAT))
> > > > > isp1760_udc_disconnect(udc);
> > > > > else
> > > > > isp1760_udc_suspend(udc);
> > > > > @@ -1335,7 +1413,7 @@ static void isp1760_udc_vbus_poll(struct timer_list *t)
> > > > >
> > > > > spin_lock_irqsave(&udc->lock, flags);
> > > > >
> > > > > - if (!(isp1760_udc_read(udc, DC_MODE) & DC_VBUSSTAT))
> > > > > + if (!(isp1760_udc_is_set(udc, DC_VBUSSTAT)))
> > > > > isp1760_udc_disconnect(udc);
> > > > > else if (udc->gadget.state >= USB_STATE_POWERED)
> > > > > mod_timer(&udc->vbus_timer,
> > > > > @@ -1412,9 +1490,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> > > > > * register, and reading the scratch register value back. The chip ID
> > > > > * and scratch register contents must match the expected values.
> > > > > */
> > > > > - isp1760_udc_write(udc, DC_SCRATCH, 0xbabe);
> > > > > - chipid = isp1760_udc_read(udc, DC_CHIPID);
> > > > > - scratch = isp1760_udc_read(udc, DC_SCRATCH);
> > > > > + isp1760_reg_write(udc->regs, ISP176x_DC_SCRATCH, 0xbabe);
> > > > > + chipid = isp1760_reg_read(udc->regs, ISP176x_DC_CHIPID);
> > > > > + scratch = isp1760_reg_read(udc->regs, ISP176x_DC_SCRATCH);
> > > > >
> > > > > if (scratch != 0xbabe) {
> > > > > dev_err(udc->isp->dev,
> > > > > @@ -1429,9 +1507,9 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
> > > > > }
> > > > >
> > > > > /* Reset the device controller. */
> > > > > - isp1760_udc_write(udc, DC_MODE, DC_SFRESET);
> > > > > + isp1760_udc_set(udc, DC_SFRESET);
> > > > > usleep_range(10000, 11000);
> > > > > - isp1760_udc_write(udc, DC_MODE, 0);
> > > > > + isp1760_reg_write(udc->regs, ISP176x_DC_MODE, 0);
> > > > > usleep_range(10000, 11000);
> > > > >
> > > > > return 0;
> > > > > @@ -1445,7 +1523,6 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq,
> > > > >
> > > > > udc->irq = -1;
> > > > > udc->isp = isp;
> > > > > - udc->regs = isp->regs;
> > > > >
> > > > > spin_lock_init(&udc->lock);
> > > > > timer_setup(&udc->vbus_timer, isp1760_udc_vbus_poll, 0);
> > > > > diff --git a/drivers/usb/isp1760/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
> > > > > index d2df650d54e9..a49096c0ac8e 100644
> > > > > --- a/drivers/usb/isp1760/isp1760-udc.h
> > > > > +++ b/drivers/usb/isp1760/isp1760-udc.h
> > > > > @@ -17,6 +17,8 @@
> > > > > #include <linux/timer.h>
> > > > > #include <linux/usb/gadget.h>
> > > > >
> > > > > +#include "isp1760-regs.h"
> > > >
> > > > Is this needed ?
> > >
> > > for DC_FIELD_MAX below, right?
> > >
> > > > > +
> > > > > struct isp1760_device;
> > > > > struct isp1760_udc;
> > > > >
> > > > > @@ -48,7 +50,7 @@ struct isp1760_ep {
> > > > > * struct isp1760_udc - UDC state information
> > > > > * irq: IRQ number
> > > > > * irqname: IRQ name (as passed to request_irq)
> > > > > - * regs: Base address of the UDC registers
> > > > > + * regs: regmap for UDC registers
> > > > > * driver: Gadget driver
> > > > > * gadget: Gadget device
> > > > > * lock: Protects driver, vbus_timer, ep, ep0_*, DC_EPINDEX register
> > > > > @@ -59,12 +61,13 @@ struct isp1760_ep {
> > > > > * connected: Tracks gadget driver bus connection state
> > > > > */
> > > > > struct isp1760_udc {
> > > > > -#ifdef CONFIG_USB_ISP1761_UDC
> > > > > struct isp1760_device *isp;
> > > > >
> > > > > int irq;
> > > > > char *irqname;
> > > > > - void __iomem *regs;
> > > > > +
> > > > > + struct regmap *regs;
> > > > > + struct regmap_field *fields[DC_FIELD_MAX];
> > > > >
> > > > > struct usb_gadget_driver *driver;
> > > > > struct usb_gadget gadget;
> > > > > @@ -81,7 +84,6 @@ struct isp1760_udc {
> > > > > bool connected;
> > > > >
> > > > > unsigned int devstatus;
> > > > > -#endif
> > > > > };
> > > > >
> > > > > #ifdef CONFIG_USB_ISP1761_UDC
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 1/7] usb: isp1760: move to regmap for register access
2021-05-06 14:59 ` Laurent Pinchart
@ 2021-05-06 15:59 ` Rui Miguel Silva
0 siblings, 0 replies; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-06 15:59 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Greg Kroah-Hartman, Sebastian Siewior, Rob Herring, linux-usb,
devicetree
Hi Laurent,
On Thu May 6, 2021 at 3:59 PM WEST, Laurent Pinchart wrote:
> Hi Rui,
>
> On Thu, May 06, 2021 at 03:14:15PM +0100, Rui Miguel Silva wrote:
> > On Thu May 6, 2021 at 2:45 PM WEST, Laurent Pinchart wrote:
> > > On Thu, May 06, 2021 at 02:39:13PM +0100, Rui Miguel Silva wrote:
> > > > On Thu May 6, 2021 at 1:24 PM WEST, Laurent Pinchart wrote:
> > > > > On Tue, May 04, 2021 at 11:19:04AM +0100, Rui Miguel Silva wrote:
> > > > > > Rework access to registers and memory to use regmap framework.
> > > > > > No change in current feature or way of work is intended with this
> > > > > > change.
> > > > > >
> > > > > > This will allow to reuse this driver with other IP of this family,
> > > > > > for example isp1763, with little changes and effort.
> > > > > >
> > > > > > Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
> > > > > > ---
<big snip>
> > > > > >
> > > > > > spin_unlock_irqrestore(&udc->lock, flags);
> > > > > > }
> > > > > > @@ -1091,19 +1158,30 @@ static void isp1760_udc_init_hw(struct isp1760_udc *udc)
> > > > > > * ACK tokens only (and NYET for the out pipe). The default
> > > > > > * configuration also generates an interrupt on the first NACK token.
> > > > > > */
> > > > > > - isp1760_udc_write(udc, DC_INTCONF, DC_CDBGMOD_ACK | DC_DDBGMODIN_ACK |
> > > > > > - DC_DDBGMODOUT_ACK_NYET);
> > > > > > -
> > > > > > - isp1760_udc_write(udc, DC_INTENABLE, DC_IEPRXTX(7) | DC_IEPRXTX(6) |
> > > > > > - DC_IEPRXTX(5) | DC_IEPRXTX(4) | DC_IEPRXTX(3) |
> > > > > > - DC_IEPRXTX(2) | DC_IEPRXTX(1) | DC_IEPRXTX(0) |
> > > > > > - DC_IEP0SETUP | DC_IEVBUS | DC_IERESM | DC_IESUSP |
> > > > > > - DC_IEHS_STA | DC_IEBRST);
> > > > > > + isp1760_udc_set(udc, DC_CDBGMOD_ACK);
> > > > > > + isp1760_udc_set(udc, DC_DDBGMODIN_ACK);
> > > > > > + isp1760_udc_set(udc, DC_DDBGMODOUT_ACK);
> > > > > > +
> > > > > > + isp1760_udc_set(udc, DC_IEPRXTX_7);
> > > > > > + isp1760_udc_set(udc, DC_IEPRXTX_6);
> > > > > > + isp1760_udc_set(udc, DC_IEPRXTX_5);
> > > > > > + isp1760_udc_set(udc, DC_IEPRXTX_4);
> > > > > > + isp1760_udc_set(udc, DC_IEPRXTX_3);
> > > > > > + isp1760_udc_set(udc, DC_IEPRXTX_2);
> > > > > > + isp1760_udc_set(udc, DC_IEPRXTX_1);
> > > > > > + isp1760_udc_set(udc, DC_IEPRXTX_0);
> > > > > > +
> > > > > > + isp1760_udc_set(udc, DC_IEP0SETUP);
> > > > > > + isp1760_udc_set(udc, DC_IEVBUS);
> > > > > > + isp1760_udc_set(udc, DC_IERESM);
> > > > > > + isp1760_udc_set(udc, DC_IESUSP);
> > > > > > + isp1760_udc_set(udc, DC_IEHS_STA);
> > > > > > + isp1760_udc_set(udc, DC_IEBRST);
>
> This is another place I've spotted while casually looking at the patch.
Ok, I will change it.
Many Thanks,
Rui
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 2/7] usb: isp1760: remove platform data struct and code
2021-05-04 10:19 [PATCH 0/7] usb: isp1760: extend support for isp1763 Rui Miguel Silva
2021-05-04 10:19 ` [PATCH 1/7] usb: isp1760: move to regmap for register access Rui Miguel Silva
@ 2021-05-04 10:19 ` Rui Miguel Silva
2021-05-04 10:19 ` [PATCH 3/7] usb: isp1760: hcd: refactor mempool config and setup Rui Miguel Silva
` (5 subsequent siblings)
7 siblings, 0 replies; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-04 10:19 UTC (permalink / raw)
To: Greg Kroah-Hartman, Sebastian Siewior, Laurent Pinchart, Rob Herring
Cc: linux-usb, devicetree, Rui Miguel Silva
Since the removal of the Blackfin port with:
commit 4ba66a976072 ("arch: remove blackfin port")
No one is using or referencing this header and platform data struct.
Remove them.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/usb/isp1760/isp1760-if.c | 20 +++-----------------
include/linux/usb/isp1760.h | 19 -------------------
2 files changed, 3 insertions(+), 36 deletions(-)
delete mode 100644 include/linux/usb/isp1760.h
diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index abfba9f5ec23..fb6701608cd8 100644
--- a/drivers/usb/isp1760/isp1760-if.c
+++ b/drivers/usb/isp1760/isp1760-if.c
@@ -16,7 +16,6 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
-#include <linux/usb/isp1760.h>
#include <linux/usb/hcd.h>
#include "isp1760-core.h"
@@ -225,22 +224,9 @@ static int isp1760_plat_probe(struct platform_device *pdev)
if (of_property_read_bool(dp, "dreq-polarity"))
devflags |= ISP1760_FLAG_DREQ_POL_HIGH;
- } else if (dev_get_platdata(&pdev->dev)) {
- struct isp1760_platform_data *pdata =
- dev_get_platdata(&pdev->dev);
-
- if (pdata->is_isp1761)
- devflags |= ISP1760_FLAG_ISP1761;
- if (pdata->bus_width_16)
- devflags |= ISP1760_FLAG_BUS_WIDTH_16;
- if (pdata->port1_otg)
- devflags |= ISP1760_FLAG_OTG_EN;
- if (pdata->analog_oc)
- devflags |= ISP1760_FLAG_ANALOG_OC;
- if (pdata->dack_polarity_high)
- devflags |= ISP1760_FLAG_DACK_POL_HIGH;
- if (pdata->dreq_polarity_high)
- devflags |= ISP1760_FLAG_DREQ_POL_HIGH;
+ } else {
+ pr_err("isp1760: no platform data\n");
+ return -ENXIO;
}
ret = isp1760_register(mem_res, irq_res->start, irqflags, &pdev->dev,
diff --git a/include/linux/usb/isp1760.h b/include/linux/usb/isp1760.h
deleted file mode 100644
index b75ded28db81..000000000000
--- a/include/linux/usb/isp1760.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * board initialization should put one of these into dev->platform_data
- * and place the isp1760 onto platform_bus named "isp1760-hcd".
- */
-
-#ifndef __LINUX_USB_ISP1760_H
-#define __LINUX_USB_ISP1760_H
-
-struct isp1760_platform_data {
- unsigned is_isp1761:1; /* Chip is ISP1761 */
- unsigned bus_width_16:1; /* 16/32-bit data bus width */
- unsigned port1_otg:1; /* Port 1 supports OTG */
- unsigned analog_oc:1; /* Analog overcurrent */
- unsigned dack_polarity_high:1; /* DACK active high */
- unsigned dreq_polarity_high:1; /* DREQ active high */
-};
-
-#endif /* __LINUX_USB_ISP1760_H */
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 3/7] usb: isp1760: hcd: refactor mempool config and setup
2021-05-04 10:19 [PATCH 0/7] usb: isp1760: extend support for isp1763 Rui Miguel Silva
2021-05-04 10:19 ` [PATCH 1/7] usb: isp1760: move to regmap for register access Rui Miguel Silva
2021-05-04 10:19 ` [PATCH 2/7] usb: isp1760: remove platform data struct and code Rui Miguel Silva
@ 2021-05-04 10:19 ` Rui Miguel Silva
2021-05-04 10:19 ` [PATCH 4/7] usb: isp1760: use dr_mode binding Rui Miguel Silva
` (4 subsequent siblings)
7 siblings, 0 replies; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-04 10:19 UTC (permalink / raw)
To: Greg Kroah-Hartman, Sebastian Siewior, Laurent Pinchart, Rob Herring
Cc: linux-usb, devicetree, Rui Miguel Silva
In preparation to support other family member IP, which may have
different memory layout. Drop macros and setup a configuration
struct.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/usb/isp1760/isp1760-core.c | 21 ++++++++
drivers/usb/isp1760/isp1760-hcd.c | 83 ++++++++++++++++++++----------
drivers/usb/isp1760/isp1760-hcd.h | 37 ++++++-------
3 files changed, 92 insertions(+), 49 deletions(-)
diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
index f78e637d3b9a..2f16adbc7624 100644
--- a/drivers/usb/isp1760/isp1760-core.c
+++ b/drivers/usb/isp1760/isp1760-core.c
@@ -100,6 +100,25 @@ void isp1760_set_pullup(struct isp1760_device *isp, bool enable)
isp1760_field_set(udc->fields, HW_DP_PULLUP_CLEAR);
}
+/*
+ * 60kb divided in:
+ * - 32 blocks @ 256 bytes
+ * - 20 blocks @ 1024 bytes
+ * - 4 blocks @ 8192 bytes
+ */
+static const struct isp1760_memory_layout isp176x_memory_conf = {
+ .blocks[0] = 32,
+ .blocks_size[0] = 256,
+ .blocks[1] = 20,
+ .blocks_size[1] = 1024,
+ .blocks[2] = 4,
+ .blocks_size[2] = 8192,
+
+ .ptd_num = 32,
+ .payload_blocks = 32 + 20 + 4,
+ .payload_area_size = 0xf000,
+};
+
static struct regmap_config isp1760_hc_regmap_conf = {
.name = "isp1760-hc",
.reg_bits = 16,
@@ -186,6 +205,8 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
udc->fields[i] = f;
}
+ hcd->memory_layout = &isp176x_memory_conf;
+
isp1760_init_core(isp);
if (IS_ENABLED(CONFIG_USB_ISP1760_HCD) && !usb_disabled()) {
diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
index 0601b1a4bd42..147ca437fc55 100644
--- a/drivers/usb/isp1760/isp1760-hcd.c
+++ b/drivers/usb/isp1760/isp1760-hcd.c
@@ -355,39 +355,29 @@ static void ptd_write(void __iomem *base, u32 ptd_offset, u32 slot,
/* memory management of the 60kb on the chip from 0x1000 to 0xffff */
static void init_memory(struct isp1760_hcd *priv)
{
- int i, curr;
+ const struct isp1760_memory_layout *mem = priv->memory_layout;
+ int i, j, curr;
u32 payload_addr;
payload_addr = PAYLOAD_OFFSET;
- for (i = 0; i < BLOCK_1_NUM; i++) {
- priv->memory_pool[i].start = payload_addr;
- priv->memory_pool[i].size = BLOCK_1_SIZE;
- priv->memory_pool[i].free = 1;
- payload_addr += priv->memory_pool[i].size;
- }
-
- curr = i;
- for (i = 0; i < BLOCK_2_NUM; i++) {
- priv->memory_pool[curr + i].start = payload_addr;
- priv->memory_pool[curr + i].size = BLOCK_2_SIZE;
- priv->memory_pool[curr + i].free = 1;
- payload_addr += priv->memory_pool[curr + i].size;
- }
- curr = i;
- for (i = 0; i < BLOCK_3_NUM; i++) {
- priv->memory_pool[curr + i].start = payload_addr;
- priv->memory_pool[curr + i].size = BLOCK_3_SIZE;
- priv->memory_pool[curr + i].free = 1;
- payload_addr += priv->memory_pool[curr + i].size;
+ for (i = 0, curr = 0; i < ARRAY_SIZE(mem->blocks); i++) {
+ for (j = 0; j < mem->blocks[i]; j++, curr++) {
+ priv->memory_pool[curr + j].start = payload_addr;
+ priv->memory_pool[curr + j].size = mem->blocks_size[i];
+ priv->memory_pool[curr + j].free = 1;
+ payload_addr += priv->memory_pool[curr + j].size;
+ }
}
- WARN_ON(payload_addr - priv->memory_pool[0].start > PAYLOAD_AREA_SIZE);
+ WARN_ON(payload_addr - priv->memory_pool[0].start >
+ mem->payload_area_size);
}
static void alloc_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ const struct isp1760_memory_layout *mem = priv->memory_layout;
int i;
WARN_ON(qtd->payload_addr);
@@ -395,7 +385,7 @@ static void alloc_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
if (!qtd->length)
return;
- for (i = 0; i < BLOCKS; i++) {
+ for (i = 0; i < mem->payload_blocks; i++) {
if (priv->memory_pool[i].size >= qtd->length &&
priv->memory_pool[i].free) {
priv->memory_pool[i].free = 0;
@@ -408,12 +398,13 @@ static void alloc_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
static void free_mem(struct usb_hcd *hcd, struct isp1760_qtd *qtd)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ const struct isp1760_memory_layout *mem = priv->memory_layout;
int i;
if (!qtd->payload_addr)
return;
- for (i = 0; i < BLOCKS; i++) {
+ for (i = 0; i < mem->payload_blocks; i++) {
if (priv->memory_pool[i].start == qtd->payload_addr) {
WARN_ON(priv->memory_pool[i].free);
priv->memory_pool[i].free = 1;
@@ -1404,8 +1395,6 @@ static int qtd_fill(struct isp1760_qtd *qtd, void *databuffer, size_t len)
{
qtd->data_buffer = databuffer;
- if (len > MAX_PAYLOAD_SIZE)
- len = MAX_PAYLOAD_SIZE;
qtd->length = len;
return qtd->length;
@@ -1429,6 +1418,8 @@ static void qtd_list_free(struct list_head *qtd_list)
static void packetize_urb(struct usb_hcd *hcd,
struct urb *urb, struct list_head *head, gfp_t flags)
{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ const struct isp1760_memory_layout *mem = priv->memory_layout;
struct isp1760_qtd *qtd;
void *buf;
int len, maxpacketsize;
@@ -1481,6 +1472,10 @@ static void packetize_urb(struct usb_hcd *hcd,
qtd = qtd_alloc(flags, urb, packet_type);
if (!qtd)
goto cleanup;
+
+ if (len > mem->blocks_size[ISP176x_BLOCK_NUM - 1])
+ len = mem->blocks_size[ISP176x_BLOCK_NUM - 1];
+
this_qtd_len = qtd_fill(qtd, buf, len);
list_add_tail(&qtd->qtd_list, head);
@@ -2209,6 +2204,7 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
int irq, unsigned long irqflags,
struct device *dev)
{
+ const struct isp1760_memory_layout *mem_layout = priv->memory_layout;
struct usb_hcd *hcd;
int ret;
@@ -2220,6 +2216,28 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
priv->hcd = hcd;
+ priv->memory_pool = kcalloc(mem_layout->payload_blocks,
+ sizeof(struct isp1760_memory_chunk),
+ GFP_KERNEL);
+ if (!priv->memory_pool) {
+ ret = -ENOMEM;
+ goto put_hcd;
+ }
+
+ priv->atl_slots = kcalloc(mem_layout->ptd_num,
+ sizeof(struct isp1760_slotinfo), GFP_KERNEL);
+ if (!priv->atl_slots) {
+ ret = -ENOMEM;
+ goto free_mem_pool;
+ }
+
+ priv->int_slots = kcalloc(mem_layout->ptd_num,
+ sizeof(struct isp1760_slotinfo), GFP_KERNEL);
+ if (!priv->int_slots) {
+ ret = -ENOMEM;
+ goto free_atl_slots;
+ }
+
init_memory(priv);
hcd->irq = irq;
@@ -2231,13 +2249,19 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
ret = usb_add_hcd(hcd, irq, irqflags);
if (ret)
- goto error;
+ goto free_int_slots;
device_wakeup_enable(hcd->self.controller);
return 0;
-error:
+free_int_slots:
+ kfree(priv->int_slots);
+free_atl_slots:
+ kfree(priv->atl_slots);
+free_mem_pool:
+ kfree(priv->memory_pool);
+put_hcd:
usb_put_hcd(hcd);
return ret;
}
@@ -2249,4 +2273,7 @@ void isp1760_hcd_unregister(struct isp1760_hcd *priv)
usb_remove_hcd(priv->hcd);
usb_put_hcd(priv->hcd);
+ kfree(priv->atl_slots);
+ kfree(priv->int_slots);
+ kfree(priv->memory_pool);
}
diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
index 34e1899e52c4..9d2427ce3f1a 100644
--- a/drivers/usb/isp1760/isp1760-hcd.h
+++ b/drivers/usb/isp1760/isp1760-hcd.h
@@ -12,24 +12,6 @@ struct isp1760_qtd;
struct resource;
struct usb_hcd;
-/*
- * 60kb divided in:
- * - 32 blocks @ 256 bytes
- * - 20 blocks @ 1024 bytes
- * - 4 blocks @ 8192 bytes
- */
-
-#define BLOCK_1_NUM 32
-#define BLOCK_2_NUM 20
-#define BLOCK_3_NUM 4
-
-#define BLOCK_1_SIZE 256
-#define BLOCK_2_SIZE 1024
-#define BLOCK_3_SIZE 8192
-#define BLOCKS (BLOCK_1_NUM + BLOCK_2_NUM + BLOCK_3_NUM)
-#define MAX_PAYLOAD_SIZE BLOCK_3_SIZE
-#define PAYLOAD_AREA_SIZE 0xf000
-
struct isp1760_slotinfo {
struct isp1760_qh *qh;
struct isp1760_qtd *qtd;
@@ -37,6 +19,17 @@ struct isp1760_slotinfo {
};
/* chip memory management */
+#define ISP176x_BLOCK_NUM 3
+
+struct isp1760_memory_layout {
+ unsigned int blocks[ISP176x_BLOCK_NUM];
+ unsigned int blocks_size[ISP176x_BLOCK_NUM];
+
+ unsigned int ptd_num;
+ unsigned int payload_blocks;
+ unsigned int payload_area_size;
+};
+
struct isp1760_memory_chunk {
unsigned int start;
unsigned int size;
@@ -58,12 +51,14 @@ struct isp1760_hcd {
struct regmap *regs;
struct regmap_field *fields[HC_FIELD_MAX];
+ const struct isp1760_memory_layout *memory_layout;
+
spinlock_t lock;
- struct isp1760_slotinfo atl_slots[32];
+ struct isp1760_slotinfo *atl_slots;
int atl_done_map;
- struct isp1760_slotinfo int_slots[32];
+ struct isp1760_slotinfo *int_slots;
int int_done_map;
- struct isp1760_memory_chunk memory_pool[BLOCKS];
+ struct isp1760_memory_chunk *memory_pool;
struct list_head qh_list[QH_END];
/* periodic schedule support */
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 4/7] usb: isp1760: use dr_mode binding
2021-05-04 10:19 [PATCH 0/7] usb: isp1760: extend support for isp1763 Rui Miguel Silva
` (2 preceding siblings ...)
2021-05-04 10:19 ` [PATCH 3/7] usb: isp1760: hcd: refactor mempool config and setup Rui Miguel Silva
@ 2021-05-04 10:19 ` Rui Miguel Silva
2021-05-04 10:19 ` [PATCH 5/7] usb: isp1760: add support for isp1763 Rui Miguel Silva
` (3 subsequent siblings)
7 siblings, 0 replies; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-04 10:19 UTC (permalink / raw)
To: Greg Kroah-Hartman, Sebastian Siewior, Laurent Pinchart, Rob Herring
Cc: linux-usb, devicetree, Rui Miguel Silva
There is already a binding to describe the dual role mode (dr_mode),
use that instead of defining a new one (port1-otg).
Update driver code and devicetree files that use that port1-otg
binding.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +-
arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +-
arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +-
arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +-
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 2 +-
arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +-
drivers/usb/isp1760/isp1760-core.c | 3 +--
drivers/usb/isp1760/isp1760-core.h | 2 +-
drivers/usb/isp1760/isp1760-if.c | 5 +++--
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/arm-realview-eb.dtsi b/arch/arm/boot/dts/arm-realview-eb.dtsi
index a534a8e444d9..04e8a27ba1eb 100644
--- a/arch/arm/boot/dts/arm-realview-eb.dtsi
+++ b/arch/arm/boot/dts/arm-realview-eb.dtsi
@@ -148,7 +148,7 @@ ethernet: ethernet@4e000000 {
usb: usb@4f000000 {
compatible = "nxp,usb-isp1761";
reg = <0x4f000000 0x20000>;
- port1-otg;
+ dr_mode = "peripheral";
};
bridge {
diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts
index f925782f8560..366687fb1ee3 100644
--- a/arch/arm/boot/dts/arm-realview-pb1176.dts
+++ b/arch/arm/boot/dts/arm-realview-pb1176.dts
@@ -166,7 +166,7 @@ usb@3b000000 {
reg = <0x3b000000 0x20000>;
interrupt-parent = <&intc_fpga1176>;
interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
- port1-otg;
+ dr_mode = "peripheral";
};
bridge {
diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts
index 0c7dabef4a5f..228a51a38f95 100644
--- a/arch/arm/boot/dts/arm-realview-pb11mp.dts
+++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts
@@ -712,7 +712,7 @@ usb@4f000000 {
reg = <0x4f000000 0x20000>;
interrupt-parent = <&intc_tc11mp>;
interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>;
- port1-otg;
+ dr_mode = "peripheral";
};
};
};
diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi
index ac95667ed781..ccf6f756b6ed 100644
--- a/arch/arm/boot/dts/arm-realview-pbx.dtsi
+++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi
@@ -164,7 +164,7 @@ ethernet: ethernet@4e000000 {
usb: usb@4f000000 {
compatible = "nxp,usb-isp1761";
reg = <0x4f000000 0x20000>;
- port1-otg;
+ dr_mode = "peripheral";
};
bridge {
diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index 4f7220b11f2d..2ad9fd7c94ec 100644
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -144,7 +144,7 @@ usb@203000000 {
compatible = "nxp,usb-isp1761";
reg = <2 0x03000000 0x20000>;
interrupts = <16>;
- port1-otg;
+ dr_mode = "peripheral";
};
iofpga-bus@300000000 {
diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi
index 2ac41ed3a57c..ec13ceb9ed36 100644
--- a/arch/arm/boot/dts/vexpress-v2m.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m.dtsi
@@ -62,7 +62,7 @@ usb@3,03000000 {
compatible = "nxp,usb-isp1761";
reg = <3 0x03000000 0x20000>;
interrupts = <16>;
- port1-otg;
+ dr_mode = "peripheral";
};
iofpga@7,00000000 {
diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
index 2f16adbc7624..51b2443ea5f8 100644
--- a/drivers/usb/isp1760/isp1760-core.c
+++ b/drivers/usb/isp1760/isp1760-core.c
@@ -72,10 +72,9 @@ static void isp1760_init_core(struct isp1760_device *isp)
* on ISP1761.
*
* TODO: Really support OTG. For now we configure port 1 in device mode
- * when OTG is requested.
*/
if ((isp->devflags & ISP1760_FLAG_ISP1761) &&
- (isp->devflags & ISP1760_FLAG_OTG_EN)) {
+ (isp->devflags & ISP1760_FLAG_PERIPHERAL_EN)) {
isp1760_field_set(hcd->fields, HW_DM_PULLDOWN);
isp1760_field_set(hcd->fields, HW_DP_PULLDOWN);
isp1760_field_set(hcd->fields, HW_OTG_DISABLE);
diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
index 8fec6395f19f..7a6755d68d41 100644
--- a/drivers/usb/isp1760/isp1760-core.h
+++ b/drivers/usb/isp1760/isp1760-core.h
@@ -28,7 +28,7 @@ struct gpio_desc;
* a sane default configuration.
*/
#define ISP1760_FLAG_BUS_WIDTH_16 0x00000002 /* 16-bit data bus width */
-#define ISP1760_FLAG_OTG_EN 0x00000004 /* Port 1 supports OTG */
+#define ISP1760_FLAG_PERIPHERAL_EN 0x00000004 /* Port 1 supports Peripheral mode*/
#define ISP1760_FLAG_ANALOG_OC 0x00000008 /* Analog overcurrent */
#define ISP1760_FLAG_DACK_POL_HIGH 0x00000010 /* DACK active high */
#define ISP1760_FLAG_DREQ_POL_HIGH 0x00000020 /* DREQ active high */
diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index fb6701608cd8..cb3e4d782315 100644
--- a/drivers/usb/isp1760/isp1760-if.c
+++ b/drivers/usb/isp1760/isp1760-if.c
@@ -17,6 +17,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/usb/hcd.h>
+#include <linux/usb/otg.h>
#include "isp1760-core.h"
#include "isp1760-regs.h"
@@ -213,8 +214,8 @@ static int isp1760_plat_probe(struct platform_device *pdev)
if (bus_width == 16)
devflags |= ISP1760_FLAG_BUS_WIDTH_16;
- if (of_property_read_bool(dp, "port1-otg"))
- devflags |= ISP1760_FLAG_OTG_EN;
+ if (usb_get_dr_mode(&pdev->dev) == USB_DR_MODE_PERIPHERAL)
+ devflags |= ISP1760_FLAG_PERIPHERAL_EN;
if (of_property_read_bool(dp, "analog-oc"))
devflags |= ISP1760_FLAG_ANALOG_OC;
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 5/7] usb: isp1760: add support for isp1763
2021-05-04 10:19 [PATCH 0/7] usb: isp1760: extend support for isp1763 Rui Miguel Silva
` (3 preceding siblings ...)
2021-05-04 10:19 ` [PATCH 4/7] usb: isp1760: use dr_mode binding Rui Miguel Silva
@ 2021-05-04 10:19 ` Rui Miguel Silva
2021-05-04 11:53 ` kernel test robot
2021-05-06 16:50 ` kernel test robot
2021-05-04 10:19 ` [PATCH 6/7] dt-bindings: usb: nxp,isp1760: add bindings Rui Miguel Silva
` (2 subsequent siblings)
7 siblings, 2 replies; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-04 10:19 UTC (permalink / raw)
To: Greg Kroah-Hartman, Sebastian Siewior, Laurent Pinchart, Rob Herring
Cc: linux-usb, devicetree, Rui Miguel Silva
isp1763 have some differences from the isp1760, 8 bit address for
registers and 16 bit for values, no bulk access to memory addresses,
16 PTD's instead of 32.
Following the regmap work done before add the registers, memory access
and add the functions to support differences in setup sequences.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/usb/isp1760/Kconfig | 4 +-
drivers/usb/isp1760/isp1760-core.c | 99 ++++-
drivers/usb/isp1760/isp1760-core.h | 4 +
drivers/usb/isp1760/isp1760-hcd.c | 613 ++++++++++++++++++++++-------
drivers/usb/isp1760/isp1760-hcd.h | 6 +-
drivers/usb/isp1760/isp1760-if.c | 12 +-
drivers/usb/isp1760/isp1760-regs.h | 243 ++++++++++--
drivers/usb/isp1760/isp1760-udc.c | 2 +
drivers/usb/isp1760/isp1760-udc.h | 2 +
9 files changed, 785 insertions(+), 200 deletions(-)
diff --git a/drivers/usb/isp1760/Kconfig b/drivers/usb/isp1760/Kconfig
index b1022cc490a2..d3384cbe1ffb 100644
--- a/drivers/usb/isp1760/Kconfig
+++ b/drivers/usb/isp1760/Kconfig
@@ -1,10 +1,10 @@
# SPDX-License-Identifier: GPL-2.0
config USB_ISP1760
- tristate "NXP ISP 1760/1761 support"
+ tristate "NXP ISP 1760/1761/1763 support"
depends on USB || USB_GADGET
help
- Say Y or M here if your system as an ISP1760 USB host controller
+ Say Y or M here if your system as an ISP1760/1763 USB host controller
or an ISP1761 USB dual-role controller.
This driver does not support isochronous transfers or OTG.
diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
index 51b2443ea5f8..31de1064aa23 100644
--- a/drivers/usb/isp1760/isp1760-core.c
+++ b/drivers/usb/isp1760/isp1760-core.c
@@ -2,12 +2,14 @@
/*
* Driver for the NXP ISP1760 chip
*
+ * Copyright 2021 Linaro, Rui Miguel Silva
* Copyright 2014 Laurent Pinchart
* Copyright 2007 Sebastian Siewior
*
* Contacts:
* Sebastian Siewior <bigeasy@linutronix.de>
* Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ * Rui Miguel Silva <rui.silva@linaro.org>
*/
#include <linux/delay.h>
@@ -23,7 +25,7 @@
#include "isp1760-regs.h"
#include "isp1760-udc.h"
-static void isp1760_init_core(struct isp1760_device *isp)
+static int isp1760_init_core(struct isp1760_device *isp)
{
struct isp1760_hcd *hcd = &isp->hcd;
struct isp1760_udc *udc = &isp->udc;
@@ -43,8 +45,15 @@ static void isp1760_init_core(struct isp1760_device *isp)
msleep(100);
/* Setup HW Mode Control: This assumes a level active-low interrupt */
+ if ((isp->devflags & ISP1760_FLAG_ANALOG_OC) && hcd->is_isp1763) {
+ dev_err(isp->dev, "isp1763 analog overcurrent not available\n");
+ return -EINVAL;
+ }
+
if (isp->devflags & ISP1760_FLAG_BUS_WIDTH_16)
isp1760_field_clear(hcd->fields, HW_DATA_BUS_WIDTH);
+ if (isp->devflags & ISP1760_FLAG_BUS_WIDTH_8)
+ isp1760_field_set(hcd->fields, HW_DATA_BUS_WIDTH);
if (isp->devflags & ISP1760_FLAG_ANALOG_OC)
isp1760_field_set(hcd->fields, HW_ANA_DIGI_OC);
if (isp->devflags & ISP1760_FLAG_DACK_POL_HIGH)
@@ -84,9 +93,14 @@ static void isp1760_init_core(struct isp1760_device *isp)
isp1760_field_set(hcd->fields, HW_SEL_CP_EXT);
}
- dev_info(isp->dev, "bus width: %u, oc: %s\n",
+ dev_info(isp->dev, "%s bus width: %u, oc: %s\n",
+ hcd->is_isp1763 ? "isp1763" : "isp1760",
+ isp->devflags & ISP1760_FLAG_BUS_WIDTH_8 ? 8 :
isp->devflags & ISP1760_FLAG_BUS_WIDTH_16 ? 16 : 32,
+ hcd->is_isp1763 ? "not available" :
isp->devflags & ISP1760_FLAG_ANALOG_OC ? "analog" : "digital");
+
+ return 0;
}
void isp1760_set_pullup(struct isp1760_device *isp, bool enable)
@@ -100,6 +114,8 @@ void isp1760_set_pullup(struct isp1760_device *isp, bool enable)
}
/*
+ * ISP1760/61:
+ *
* 60kb divided in:
* - 32 blocks @ 256 bytes
* - 20 blocks @ 1024 bytes
@@ -113,38 +129,72 @@ static const struct isp1760_memory_layout isp176x_memory_conf = {
.blocks[2] = 4,
.blocks_size[2] = 8192,
- .ptd_num = 32,
+ .slot_num = 32,
.payload_blocks = 32 + 20 + 4,
.payload_area_size = 0xf000,
};
+/*
+ * ISP1763:
+ *
+ * 20kb divided in:
+ * - 8 blocks @ 256 bytes
+ * - 2 blocks @ 1024 bytes
+ * - 4 blocks @ 4096 bytes
+ */
+static const struct isp1760_memory_layout isp1763_memory_conf = {
+ .blocks[0] = 8,
+ .blocks_size[0] = 256,
+ .blocks[1] = 2,
+ .blocks_size[1] = 1024,
+ .blocks[2] = 4,
+ .blocks_size[2] = 4096,
+
+ .slot_num = 16,
+ .payload_blocks = 8 + 2 + 4,
+ .payload_area_size = 0x5000,
+};
+
static struct regmap_config isp1760_hc_regmap_conf = {
.name = "isp1760-hc",
.reg_bits = 16,
+ .reg_stride = 4,
.val_bits = 32,
.fast_io = true,
- .max_register = ISP176x_HC_MEMORY,
+ .max_register = ISP176x_HC_OTG_CTRL_CLEAR,
.volatile_table = &isp176x_hc_volatile_table,
};
+static struct regmap_config isp1763_hc_regmap_conf = {
+ .name = "isp1763-hc",
+ .reg_bits = 8,
+ .reg_stride = 2,
+ .val_bits = 16,
+ .fast_io = true,
+ .max_register = ISP1763_HC_OTG_CTRL_CLEAR,
+ .volatile_table = &isp1763_hc_volatile_table,
+};
+
static struct regmap_config isp1761_dc_regmap_conf = {
.name = "isp1761-dc",
.reg_bits = 16,
+ .reg_stride = 4,
.val_bits = 32,
.fast_io = true,
- .max_register = ISP1761_DC_OTG_CTRL_CLEAR,
+ .max_register = ISP176x_DC_TESTMODE,
.volatile_table = &isp176x_dc_volatile_table,
};
int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
struct device *dev, unsigned int devflags)
{
+ bool udc_disabled = !(devflags & ISP1760_FLAG_ISP1761);
+ const struct regmap_config *hc_regmap;
+ const struct reg_field *hc_reg_fields;
struct isp1760_device *isp;
struct isp1760_hcd *hcd;
struct isp1760_udc *udc;
- bool udc_disabled = !(devflags & ISP1760_FLAG_ISP1761);
struct regmap_field *f;
- void __iomem *base;
int ret;
int i;
@@ -170,6 +220,24 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
isp1761_dc_regmap_conf.val_bits = 16;
}
+ hcd->is_isp1763 = !!(devflags & ISP1760_FLAG_ISP1763);
+
+ if (!hcd->is_isp1763 && (devflags & ISP1760_FLAG_BUS_WIDTH_8)) {
+ dev_err(dev, "isp1760/61 do not support data width 8\n");
+ return -EINVAL;
+ }
+
+ if (devflags & ISP1760_FLAG_BUS_WIDTH_8)
+ isp1763_hc_regmap_conf.val_bits = 8;
+
+ if (hcd->is_isp1763) {
+ hc_regmap = &isp1763_hc_regmap_conf;
+ hc_reg_fields = &isp1763_hc_reg_fields[0];
+ } else {
+ hc_regmap = &isp1760_hc_regmap_conf;
+ hc_reg_fields = &isp1760_hc_reg_fields[0];
+ }
+
isp->rst_gpio = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);
if (IS_ERR(isp->rst_gpio))
return PTR_ERR(isp->rst_gpio);
@@ -178,20 +246,20 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
if (IS_ERR(hcd->base))
return PTR_ERR(hcd->base);
- hcd->regs = devm_regmap_init_mmio(dev, base, &isp1760_hc_regmap_conf);
+ hcd->regs = devm_regmap_init_mmio(dev, hcd->base, hc_regmap);
if (IS_ERR(hcd->regs))
return PTR_ERR(hcd->regs);
for (i = 0; i < HC_FIELD_MAX; i++) {
- f = devm_regmap_field_alloc(dev, hcd->regs,
- isp1760_hc_reg_fields[i]);
+ f = devm_regmap_field_alloc(dev, hcd->regs, hc_reg_fields[i]);
if (IS_ERR(f))
return PTR_ERR(f);
hcd->fields[i] = f;
}
- udc->regs = devm_regmap_init_mmio(dev, base, &isp1761_dc_regmap_conf);
+ udc->regs = devm_regmap_init_mmio(dev, hcd->base,
+ &isp1761_dc_regmap_conf);
if (IS_ERR(udc->regs))
return PTR_ERR(udc->regs);
@@ -204,9 +272,14 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
udc->fields[i] = f;
}
- hcd->memory_layout = &isp176x_memory_conf;
+ if (hcd->is_isp1763)
+ hcd->memory_layout = &isp1763_memory_conf;
+ else
+ hcd->memory_layout = &isp176x_memory_conf;
- isp1760_init_core(isp);
+ ret = isp1760_init_core(isp);
+ if (ret < 0)
+ return ret;
if (IS_ENABLED(CONFIG_USB_ISP1760_HCD) && !usb_disabled()) {
ret = isp1760_hcd_register(hcd, mem, irq,
diff --git a/drivers/usb/isp1760/isp1760-core.h b/drivers/usb/isp1760/isp1760-core.h
index 7a6755d68d41..91e0ee3992a7 100644
--- a/drivers/usb/isp1760/isp1760-core.h
+++ b/drivers/usb/isp1760/isp1760-core.h
@@ -2,12 +2,14 @@
/*
* Driver for the NXP ISP1760 chip
*
+ * Copyright 2021 Linaro, Rui Miguel Silva
* Copyright 2014 Laurent Pinchart
* Copyright 2007 Sebastian Siewior
*
* Contacts:
* Sebastian Siewior <bigeasy@linutronix.de>
* Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ * Rui Miguel Silva <rui.silva@linaro.org>
*/
#ifndef _ISP1760_CORE_H_
@@ -35,6 +37,8 @@ struct gpio_desc;
#define ISP1760_FLAG_ISP1761 0x00000040 /* Chip is ISP1761 */
#define ISP1760_FLAG_INTR_POL_HIGH 0x00000080 /* Interrupt polarity active high */
#define ISP1760_FLAG_INTR_EDGE_TRIG 0x00000100 /* Interrupt edge triggered */
+#define ISP1760_FLAG_ISP1763 0x00000200 /* Chip is ISP1763 */
+#define ISP1760_FLAG_BUS_WIDTH_8 0x00000400 /* 8-bit data bus width */
struct isp1760_device {
struct device *dev;
diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
index 147ca437fc55..eb51d8901461 100644
--- a/drivers/usb/isp1760/isp1760-hcd.c
+++ b/drivers/usb/isp1760/isp1760-hcd.c
@@ -11,6 +11,8 @@
*
* (c) 2011 Arvid Brodin <arvid.brodin@enea.com>
*
+ * Copyright 2021 Linaro, Rui Miguel Silva <rui.silva@linaro.org>
+ *
*/
#include <linux/gpio/consumer.h>
#include <linux/module.h>
@@ -93,7 +95,7 @@ struct ptd {
#define TO_DW2_RL(x) ((x) << 25)
#define FROM_DW2_RL(x) (((x) >> 25) & 0xf)
/* DW3 */
-#define FROM_DW3_NRBYTESTRANSFERRED(x) ((x) & 0x7fff)
+#define FROM_DW3_NRBYTESTRANSFERRED(x) ((x) & 0x3fff)
#define FROM_DW3_SCS_NRBYTESTRANSFERRED(x) ((x) & 0x07ff)
#define TO_DW3_NAKCOUNT(x) ((x) << 19)
#define FROM_DW3_NAKCOUNT(x) (((x) >> 19) & 0xf)
@@ -120,7 +122,7 @@ struct ptd {
/* Errata 1 */
#define RL_COUNTER (0)
#define NAK_COUNTER (0)
-#define ERR_COUNTER (2)
+#define ERR_COUNTER (3)
struct isp1760_qtd {
u8 packet_type;
@@ -172,10 +174,30 @@ static u32 isp1760_hcd_read(struct usb_hcd *hcd, u32 field)
return isp1760_field_read(priv->fields, field);
}
+/*
+ * We need, in isp1763, to write directly the values to the portsc1
+ * register so it will make the other values to trigger.
+ */
+static void isp1760_hcd_portsc1_set_clear(struct isp1760_hcd *priv, u32 field,
+ u32 val)
+{
+ u32 bit = isp1763_hc_portsc1_fields[field];
+ u32 temp = readl(priv->base + ISP1763_HC_PORTSC1);
+
+ if (val)
+ writel(temp | bit, priv->base + ISP1763_HC_PORTSC1);
+ else
+ writel(temp & ~bit, priv->base + ISP1763_HC_PORTSC1);
+}
+
static void isp1760_hcd_write(struct usb_hcd *hcd, u32 field, u32 val)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ if (unlikely(priv->is_isp1763 &&
+ (field >= PORT_OWNER && field <= PORT_CONNECT)))
+ return isp1760_hcd_portsc1_set_clear(priv, field, val);
+
isp1760_field_write(priv->fields, field, val);
}
@@ -189,28 +211,40 @@ static void isp1760_hcd_clear(struct usb_hcd *hcd, u32 field)
isp1760_hcd_write(hcd, field, 0);
}
-static int isp1760_hcd_set_poll_timeout(struct usb_hcd *hcd, u32 field,
- u32 timeout_us)
+static int isp1760_hcd_set_and_wait(struct usb_hcd *hcd, u32 field,
+ u32 timeout_us)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ u32 val;
+
+ isp1760_hcd_set(hcd, field);
+
+ return regmap_field_read_poll_timeout(priv->fields[field], val,
+ val, 10, timeout_us);
+}
+
+static int isp1760_hcd_set_and_wait_swap(struct usb_hcd *hcd, u32 field,
+ u32 timeout_us)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
- unsigned int val;
+ u32 val;
isp1760_hcd_set(hcd, field);
- return regmap_field_read_poll_timeout(priv->fields[field], val, 1, 1,
- timeout_us);
+ return regmap_field_read_poll_timeout(priv->fields[field], val,
+ !val, 10, timeout_us);
}
-static int isp1760_hcd_clear_poll_timeout(struct usb_hcd *hcd, u32 field,
- u32 timeout_us)
+static int isp1760_hcd_clear_and_wait(struct usb_hcd *hcd, u32 field,
+ u32 timeout_us)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
- unsigned int val;
+ u32 val;
isp1760_hcd_clear(hcd, field);
- return regmap_field_read_poll_timeout(priv->fields[field], val, 0, 1,
- timeout_us);
+ return regmap_field_read_poll_timeout(priv->fields[field], val,
+ !val, 10, timeout_us);
}
static bool isp1760_hcd_is_set(struct usb_hcd *hcd, u32 field)
@@ -218,12 +252,32 @@ static bool isp1760_hcd_is_set(struct usb_hcd *hcd, u32 field)
return !!isp1760_hcd_read(hcd, field);
}
+static bool isp1760_hcd_ppc_is_set(struct usb_hcd *hcd)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
+ if (priv->is_isp1763)
+ return true;
+
+ return isp1760_hcd_is_set(hcd, HCS_PPC);
+}
+
+static u32 isp1760_hcd_n_ports(struct usb_hcd *hcd)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
+ if (priv->is_isp1763)
+ return 1;
+
+ return isp1760_hcd_read(hcd, HCS_N_PORTS);
+}
+
/*
* Access functions for isp176x memory (offset >= 0x0400).
*
* bank_reads8() reads memory locations prefetched by an earlier write to
* HC_MEMORY_REG (see isp176x datasheet). Unless you want to do fancy multi-
- * bank optimizations, you should use the more generic mem_reads8() below.
+ * bank optimizations, you should use the more generic mem_read() below.
*
* For access to ptd memory, use the specialized ptd_read() and ptd_write()
* below.
@@ -278,19 +332,61 @@ static void bank_reads8(void __iomem *src_base, u32 src_offset, u32 bank_addr,
}
}
-static void mem_reads8(struct usb_hcd *hcd, void __iomem *src_base,
- u32 src_offset, void *dst, u32 bytes)
+static void isp1760_mem_read(struct usb_hcd *hcd, u32 src_offset, void *dst,
+ u32 bytes)
{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
isp1760_hcd_write(hcd, MEM_START_ADDR, src_offset);
+ ndelay(100);
- ndelay(90);
+ bank_reads8(priv->base, src_offset, ISP_BANK_0, dst, bytes);
+}
+
+/*
+ * ISP1763 does not have the banks direct host controller memory access,
+ * needs to use the HC_DATA register. Add data read/write according to this,
+ * and also adjust 16bit access, here is assumed that the address was already
+ * written in the MEM_START_ADDR field.
+ */
+static void isp1763_mem_read(struct usb_hcd *hcd, u16 srcaddr,
+ u16 *dstptr, u32 bytes)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
- bank_reads8(src_base, src_offset, ISP_BANK_0, dst, bytes);
+ /* Write the starting device address to the hcd memory register */
+ //reg_write16(base, HC_MEMORY_REG, srcaddr);
+ isp1760_reg_write(priv->regs, ISP1763_HC_MEMORY, srcaddr);
+ ndelay(100); /* Delay between consecutive access */
+
+ /* As long there are at least 16-bit to read ... */
+ while (bytes >= 2) {
+ *dstptr = __raw_readw(priv->base + ISP1763_HC_DATA);
+ bytes -= 2;
+ dstptr++;
+ }
+
+ /* If there are no more bytes to read, return */
+ if (bytes <= 0)
+ return;
+
+ *((u8 *)dstptr) = (u8)(readw(priv->base + ISP1763_HC_DATA) & 0xFF);
}
-static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
- __u32 const *src, u32 bytes)
+static void mem_read(struct usb_hcd *hcd, u32 src_offset, __u32 *dst,
+ u32 bytes)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
+ if (!priv->is_isp1763)
+ return isp1760_mem_read(hcd, src_offset, (u16 *)dst, bytes);
+
+ isp1763_mem_read(hcd, (u16)src_offset, (u16 *)dst, bytes);
+}
+
+static void isp1760_mem_write(void __iomem *dst_base, u32 dst_offset,
+ __u32 const *src, u32 bytes)
{
__u32 __iomem *dst;
@@ -324,33 +420,135 @@ static void mem_writes8(void __iomem *dst_base, u32 dst_offset,
__raw_writel(*src, dst);
}
+static void isp1763_mem_write(struct usb_hcd *hcd, u16 dstaddr, u16 *src,
+ u32 bytes)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
+ /* Write the starting device address to the hcd memory register */
+ isp1760_reg_write(priv->regs, ISP1763_HC_MEMORY, dstaddr);
+ ndelay(100); /* Delay between consecutive access */
+
+ while (bytes >= 2) {
+ /* Get and write the data; then adjust the data ptr and len */
+ __raw_writew(*src, priv->base + ISP1763_HC_DATA);
+ bytes -= 2;
+ src++;
+ }
+
+ /* If there are no more bytes to process, return */
+ if (bytes <= 0)
+ return;
+
+ /*
+ * The only way to get here is if there is a single byte left,
+ * get it and write it to the data reg;
+ */
+ writew(*((u8 *)src), priv->base + ISP1763_HC_DATA);
+}
+
+static void mem_write(struct usb_hcd *hcd, u32 dst_offset, __u32 *src,
+ u32 bytes)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
+ if (!priv->is_isp1763)
+ return isp1760_mem_write(priv->base, dst_offset, src, bytes);
+
+ isp1763_mem_write(hcd, dst_offset, (u16 *)src, bytes);
+}
+
/*
* Read and write ptds. 'ptd_offset' should be one of ISO_PTD_OFFSET,
* INT_PTD_OFFSET, and ATL_PTD_OFFSET. 'slot' should be less than 32.
*/
-static void ptd_read(struct usb_hcd *hcd, void __iomem *base,
- u32 ptd_offset, u32 slot, struct ptd *ptd)
+static void isp1760_ptd_read(struct usb_hcd *hcd, u32 ptd_offset, u32 slot,
+ struct ptd *ptd)
{
+ u16 src_offset = ptd_offset + slot * sizeof(*ptd);
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
isp1760_hcd_write(hcd, MEM_BANK_SEL, ISP_BANK_0);
- isp1760_hcd_write(hcd, MEM_START_ADDR,
- ptd_offset + slot * sizeof(*ptd));
+ isp1760_hcd_write(hcd, MEM_START_ADDR, src_offset);
ndelay(90);
- bank_reads8(base, ptd_offset + slot * sizeof(*ptd), ISP_BANK_0,
- (void *)ptd, sizeof(*ptd));
+
+ bank_reads8(priv->base, src_offset, ISP_BANK_0, (void *)ptd,
+ sizeof(*ptd));
+}
+
+static void isp1763_ptd_read(struct usb_hcd *hcd, u32 ptd_offset, u32 slot,
+ struct ptd *ptd)
+{
+ u16 src_offset = ptd_offset + slot * sizeof(*ptd);
+ struct ptd le32_ptd;
+
+ isp1763_mem_read(hcd, src_offset, (u16 *)&le32_ptd, sizeof(le32_ptd));
+ /* Normalize the data obtained */
+ ptd->dw0 = le32_to_cpu(le32_ptd.dw0);
+ ptd->dw1 = le32_to_cpu(le32_ptd.dw1);
+ ptd->dw2 = le32_to_cpu(le32_ptd.dw2);
+ ptd->dw3 = le32_to_cpu(le32_ptd.dw3);
+ ptd->dw4 = le32_to_cpu(le32_ptd.dw4);
+ ptd->dw5 = le32_to_cpu(le32_ptd.dw5);
+ ptd->dw6 = le32_to_cpu(le32_ptd.dw6);
+ ptd->dw7 = le32_to_cpu(le32_ptd.dw7);
+}
+
+static void ptd_read(struct usb_hcd *hcd, u32 ptd_offset, u32 slot,
+ struct ptd *ptd)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
+ if (!priv->is_isp1763)
+ return isp1760_ptd_read(hcd, ptd_offset, slot, ptd);
+
+ isp1763_ptd_read(hcd, ptd_offset, slot, ptd);
+}
+
+static void isp1763_ptd_write(struct usb_hcd *hcd, u32 ptd_offset, u32 slot,
+ struct ptd *cpu_ptd)
+{
+ u16 dst_offset = ptd_offset + slot * sizeof(*cpu_ptd);
+ struct ptd ptd;
+
+ ptd.dw0 = cpu_to_le32(cpu_ptd->dw0);
+ ptd.dw1 = cpu_to_le32(cpu_ptd->dw1);
+ ptd.dw2 = cpu_to_le32(cpu_ptd->dw2);
+ ptd.dw3 = cpu_to_le32(cpu_ptd->dw3);
+ ptd.dw4 = cpu_to_le32(cpu_ptd->dw4);
+ ptd.dw5 = cpu_to_le32(cpu_ptd->dw5);
+ ptd.dw6 = cpu_to_le32(cpu_ptd->dw6);
+ ptd.dw7 = cpu_to_le32(cpu_ptd->dw7);
+
+ isp1763_mem_write(hcd, dst_offset, (u16 *)&ptd.dw0,
+ 8 * sizeof(ptd.dw0));
}
-static void ptd_write(void __iomem *base, u32 ptd_offset, u32 slot,
- struct ptd *ptd)
+static void isp1760_ptd_write(void __iomem *base, u32 ptd_offset, u32 slot,
+ struct ptd *ptd)
{
- mem_writes8(base, ptd_offset + slot*sizeof(*ptd) + sizeof(ptd->dw0),
- &ptd->dw1, 7*sizeof(ptd->dw1));
- /* Make sure dw0 gets written last (after other dw's and after payload)
- since it contains the enable bit */
+ u32 dst_offset = ptd_offset + slot * sizeof(*ptd);
+
+ /*
+ * Make sure dw0 gets written last (after other dw's and after payload)
+ * since it contains the enable bit
+ */
+ isp1760_mem_write(base, dst_offset + sizeof(ptd->dw0), &ptd->dw1,
+ 7 * sizeof(ptd->dw1));
wmb();
- mem_writes8(base, ptd_offset + slot*sizeof(*ptd), &ptd->dw0,
- sizeof(ptd->dw0));
+ isp1760_mem_write(base, dst_offset, &ptd->dw0, sizeof(ptd->dw0));
}
+static void ptd_write(struct usb_hcd *hcd, u32 ptd_offset, u32 slot,
+ struct ptd *ptd)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+
+ if (!priv->is_isp1763)
+ return isp1760_ptd_write(priv->base, ptd_offset, slot, ptd);
+
+ isp1763_ptd_write(hcd, ptd_offset, slot, ptd);
+}
/* memory management of the 60kb on the chip from 0x1000 to 0xffff */
static void init_memory(struct isp1760_hcd *priv)
@@ -427,7 +625,7 @@ static int ehci_reset(struct usb_hcd *hcd)
hcd->state = HC_STATE_HALT;
priv->next_statechange = jiffies;
- return isp1760_hcd_set_poll_timeout(hcd, CMD_RESET, 250 * 1000);
+ return isp1760_hcd_set_and_wait_swap(hcd, CMD_RESET, 250 * 1000);
}
static struct isp1760_qh *qh_alloc(gfp_t flags)
@@ -458,7 +656,6 @@ static int priv_init(struct usb_hcd *hcd)
struct isp1760_hcd *priv = hcd_to_priv(hcd);
u32 isoc_cache;
u32 isoc_thres;
-
int i;
spin_lock_init(&priv->lock);
@@ -472,9 +669,14 @@ static int priv_init(struct usb_hcd *hcd)
*/
priv->periodic_size = DEFAULT_I_TDPS;
+ if (priv->is_isp1763) {
+ priv->i_thresh = 2;
+ return 0;
+ }
+
/* controllers may cache some of the periodic schedule ... */
- isoc_cache = isp1760_hcd_read(hcd->regs, HCC_ISOC_CACHE);
- isoc_thres = isp1760_hcd_read(hcd->regs, HCC_ISOC_THRES);
+ isoc_cache = isp1760_hcd_read(hcd, HCC_ISOC_CACHE);
+ isoc_thres = isp1760_hcd_read(hcd, HCC_ISOC_THRES);
/* full frame cache */
if (isoc_cache)
@@ -488,15 +690,22 @@ static int priv_init(struct usb_hcd *hcd)
static int isp1760_hc_setup(struct usb_hcd *hcd)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ u32 atx_reset;
int result;
u32 scratch;
+ u32 pattern;
+
+ if (priv->is_isp1763)
+ pattern = 0xdead;
+ else
+ pattern = 0xdeadbeef;
- isp1760_reg_write(priv->regs, ISP176x_HC_SCRATCH, 0xdeadbabe);
+ isp1760_hcd_write(hcd, HC_SCRATCH, pattern);
/* Change bus pattern */
- scratch = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
- scratch = isp1760_reg_read(priv->regs, ISP176x_HC_SCRATCH);
- if (scratch != 0xdeadbabe) {
+ scratch = isp1760_hcd_read(hcd, HC_CHIP_ID_HIGH);
+ scratch = isp1760_hcd_read(hcd, HC_SCRATCH);
+ if (scratch != pattern) {
dev_err(hcd->self.controller, "Scratch test failed.\n");
return -ENODEV;
}
@@ -509,13 +718,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
* the host controller through the EHCI USB Command register. The device
* has been reset in core code anyway, so this shouldn't matter.
*/
- isp1760_reg_write(priv->regs, ISP176x_HC_BUFFER_STATUS, 0);
- isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
- NO_TRANSFER_ACTIVE);
- isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
- NO_TRANSFER_ACTIVE);
- isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP,
- NO_TRANSFER_ACTIVE);
+ isp1760_hcd_clear(hcd, ISO_BUF_FILL);
+ isp1760_hcd_clear(hcd, INT_BUF_FILL);
+ isp1760_hcd_clear(hcd, ATL_BUF_FILL);
+
+ isp1760_hcd_set(hcd, HC_ATL_PTD_SKIPMAP);
+ isp1760_hcd_set(hcd, HC_INT_PTD_SKIPMAP);
+ isp1760_hcd_set(hcd, HC_ISO_PTD_SKIPMAP);
result = ehci_reset(hcd);
if (result)
@@ -524,11 +733,26 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
/* Step 11 passed */
/* ATL reset */
- isp1760_hcd_set(hcd, ALL_ATX_RESET);
+ if (priv->is_isp1763)
+ atx_reset = SW_RESET_RESET_ATX;
+ else
+ atx_reset = ALL_ATX_RESET;
+
+ isp1760_hcd_set(hcd, atx_reset);
mdelay(10);
- isp1760_hcd_clear(hcd, ALL_ATX_RESET);
+ isp1760_hcd_clear(hcd, atx_reset);
- isp1760_hcd_set(hcd, HC_INT_ENABLE);
+ if (priv->is_isp1763) {
+ isp1760_hcd_set(hcd, HW_OTG_DISABLE);
+ isp1760_hcd_set(hcd, HW_SW_SEL_HC_DC_CLEAR);
+ isp1760_hcd_set(hcd, HW_HC_2_DIS_CLEAR);
+ mdelay(10);
+
+ isp1760_hcd_set(hcd, HW_INTF_LOCK);
+ }
+
+ isp1760_hcd_set(hcd, HC_INT_IRQ_ENABLE);
+ isp1760_hcd_set(hcd, HC_ATL_IRQ_ENABLE);
return priv_init(hcd);
}
@@ -748,45 +972,45 @@ static void start_bus_transfer(struct usb_hcd *hcd, u32 ptd_offset, int slot,
struct ptd *ptd)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ const struct isp1760_memory_layout *mem = priv->memory_layout;
int skip_map;
- WARN_ON((slot < 0) || (slot > 31));
+ WARN_ON((slot < 0) || (slot > mem->slot_num - 1));
WARN_ON(qtd->length && !qtd->payload_addr);
WARN_ON(slots[slot].qtd);
WARN_ON(slots[slot].qh);
WARN_ON(qtd->status != QTD_PAYLOAD_ALLOC);
+ if (priv->is_isp1763)
+ ndelay(100);
+
/* Make sure done map has not triggered from some unlinked transfer */
if (ptd_offset == ATL_PTD_OFFSET) {
- priv->atl_done_map |= isp1760_reg_read(priv->regs,
- ISP176x_HC_ATL_PTD_DONEMAP);
+ skip_map = isp1760_hcd_read(hcd, HC_ATL_PTD_SKIPMAP);
+ isp1760_hcd_write(hcd, HC_ATL_PTD_SKIPMAP,
+ skip_map | (1 << slot));
+ priv->atl_done_map |= isp1760_hcd_read(hcd, HC_ATL_PTD_DONEMAP);
priv->atl_done_map &= ~(1 << slot);
} else {
- priv->int_done_map |= isp1760_reg_read(priv->regs,
- ISP176x_HC_INT_PTD_DONEMAP);
+ skip_map = isp1760_hcd_read(hcd, HC_INT_PTD_SKIPMAP);
+ isp1760_hcd_write(hcd, HC_INT_PTD_SKIPMAP,
+ skip_map | (1 << slot));
+ priv->int_done_map |= isp1760_hcd_read(hcd, HC_INT_PTD_DONEMAP);
priv->int_done_map &= ~(1 << slot);
}
+ skip_map &= ~(1 << slot);
qh->slot = slot;
qtd->status = QTD_XFER_STARTED;
slots[slot].timestamp = jiffies;
slots[slot].qtd = qtd;
slots[slot].qh = qh;
- ptd_write(priv->base, ptd_offset, slot, ptd);
+ ptd_write(hcd, ptd_offset, slot, ptd);
- if (ptd_offset == ATL_PTD_OFFSET) {
- skip_map = isp1760_reg_read(priv->regs,
- ISP176x_HC_ATL_PTD_SKIPMAP);
- skip_map &= ~(1 << qh->slot);
- isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
- skip_map);
- } else {
- skip_map = isp1760_reg_read(priv->regs,
- ISP176x_HC_INT_PTD_SKIPMAP);
- skip_map &= ~(1 << qh->slot);
- isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
- skip_map);
- }
+ if (ptd_offset == ATL_PTD_OFFSET)
+ isp1760_hcd_write(hcd, HC_ATL_PTD_SKIPMAP, skip_map);
+ else
+ isp1760_hcd_write(hcd, HC_INT_PTD_SKIPMAP, skip_map);
}
static int is_short_bulk(struct isp1760_qtd *qtd)
@@ -798,7 +1022,6 @@ static int is_short_bulk(struct isp1760_qtd *qtd)
static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
struct list_head *urb_list)
{
- struct isp1760_hcd *priv = hcd_to_priv(hcd);
struct isp1760_qtd *qtd, *qtd_next;
struct urb_listitem *urb_listitem;
int last_qtd;
@@ -816,10 +1039,9 @@ static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
if (qtd->actual_length) {
switch (qtd->packet_type) {
case IN_PID:
- mem_reads8(hcd, priv->base,
- qtd->payload_addr,
- qtd->data_buffer,
- qtd->actual_length);
+ mem_read(hcd, qtd->payload_addr,
+ qtd->data_buffer,
+ qtd->actual_length);
fallthrough;
case OUT_PID:
qtd->urb->actual_length +=
@@ -863,6 +1085,8 @@ static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ const struct isp1760_memory_layout *mem = priv->memory_layout;
+ int slot_num = mem->slot_num;
int ptd_offset;
struct isp1760_slotinfo *slots;
int curr_slot, free_slot;
@@ -889,7 +1113,7 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
}
free_slot = -1;
- for (curr_slot = 0; curr_slot < 32; curr_slot++) {
+ for (curr_slot = 0; curr_slot < slot_num; curr_slot++) {
if ((free_slot == -1) && (slots[curr_slot].qtd == NULL))
free_slot = curr_slot;
if (slots[curr_slot].qh == qh)
@@ -904,11 +1128,10 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
if ((qtd->length) && (!qtd->payload_addr))
break;
- if ((qtd->length) &&
- ((qtd->packet_type == SETUP_PID) ||
- (qtd->packet_type == OUT_PID))) {
- mem_writes8(priv->base, qtd->payload_addr,
- qtd->data_buffer, qtd->length);
+ if (qtd->length && (qtd->packet_type == SETUP_PID ||
+ qtd->packet_type == OUT_PID)) {
+ mem_write(hcd, qtd->payload_addr,
+ qtd->data_buffer, qtd->length);
}
qtd->status = QTD_PAYLOAD_ALLOC;
@@ -921,7 +1144,7 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
"available for transfer\n", __func__);
*/
/* Start xfer for this endpoint if not already done */
- if ((curr_slot > 31) && (free_slot > -1)) {
+ if ((curr_slot > slot_num - 1) && (free_slot > -1)) {
if (usb_pipeint(qtd->urb->pipe))
create_ptd_int(qh, qtd, &ptd);
else
@@ -1108,9 +1331,9 @@ static void handle_done_ptds(struct usb_hcd *hcd)
int modified;
int skip_map;
- skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP);
+ skip_map = isp1760_hcd_read(hcd, HC_INT_PTD_SKIPMAP);
priv->int_done_map &= ~skip_map;
- skip_map = isp1760_reg_read(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP);
+ skip_map = isp1760_hcd_read(hcd, HC_ATL_PTD_SKIPMAP);
priv->atl_done_map &= ~skip_map;
modified = priv->int_done_map || priv->atl_done_map;
@@ -1128,7 +1351,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
continue;
}
ptd_offset = INT_PTD_OFFSET;
- ptd_read(hcd, priv->base, INT_PTD_OFFSET, slot, &ptd);
+ ptd_read(hcd, INT_PTD_OFFSET, slot, &ptd);
state = check_int_transfer(hcd, &ptd,
slots[slot].qtd->urb);
} else {
@@ -1143,7 +1366,7 @@ static void handle_done_ptds(struct usb_hcd *hcd)
continue;
}
ptd_offset = ATL_PTD_OFFSET;
- ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
+ ptd_read(hcd, ATL_PTD_OFFSET, slot, &ptd);
state = check_atl_transfer(hcd, &ptd,
slots[slot].qtd->urb);
}
@@ -1244,19 +1467,18 @@ static irqreturn_t isp1760_irq(struct usb_hcd *hcd)
if (!(hcd->state & HC_STATE_RUNNING))
goto leave;
- imask = isp1760_reg_read(priv->regs, ISP176x_HC_INTERRUPT);
+ imask = isp1760_hcd_read(hcd, HC_INTERRUPT);
if (unlikely(!imask))
goto leave;
- isp1760_reg_write(priv->regs, ISP176x_HC_INTERRUPT, imask); /* Clear */
+ isp1760_reg_write(priv->regs, ISP1763_HC_INTERRUPT, imask);
- priv->int_done_map |= isp1760_reg_read(priv->regs,
- ISP176x_HC_INT_PTD_DONEMAP);
- priv->atl_done_map |= isp1760_reg_read(priv->regs,
- ISP176x_HC_ATL_PTD_DONEMAP);
+ priv->int_done_map |= isp1760_hcd_read(hcd, HC_INT_PTD_DONEMAP);
+ priv->atl_done_map |= isp1760_hcd_read(hcd, HC_ATL_PTD_DONEMAP);
handle_done_ptds(hcd);
irqret = IRQ_HANDLED;
+
leave:
spin_unlock(&priv->lock);
@@ -1297,17 +1519,18 @@ static void errata2_function(struct timer_list *unused)
{
struct usb_hcd *hcd = errata2_timer_hcd;
struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ const struct isp1760_memory_layout *mem = priv->memory_layout;
int slot;
struct ptd ptd;
unsigned long spinflags;
spin_lock_irqsave(&priv->lock, spinflags);
- for (slot = 0; slot < 32; slot++)
+ for (slot = 0; slot < mem->slot_num; slot++)
if (priv->atl_slots[slot].qh && time_after(jiffies,
priv->atl_slots[slot].timestamp +
msecs_to_jiffies(SLOT_TIMEOUT))) {
- ptd_read(hcd, priv->base, ATL_PTD_OFFSET, slot, &ptd);
+ ptd_read(hcd, ATL_PTD_OFFSET, slot, &ptd);
if (!FROM_DW0_VALID(ptd.dw0) &&
!FROM_DW3_ACTIVE(ptd.dw3))
priv->atl_done_map |= 1 << slot;
@@ -1322,23 +1545,113 @@ static void errata2_function(struct timer_list *unused)
add_timer(&errata2_timer);
}
+static int isp1763_run(struct usb_hcd *hcd)
+{
+ struct isp1760_hcd *priv = hcd_to_priv(hcd);
+ int retval;
+ u32 chipid_h;
+ u32 chipid_l;
+ u32 chip_rev;
+ u32 ptd_atl_int;
+ u32 ptd_iso;
+
+ hcd->uses_new_polling = 1;
+ hcd->state = HC_STATE_RUNNING;
+
+ chipid_h = isp1760_hcd_read(hcd, HC_CHIP_ID_HIGH);
+ chipid_l = isp1760_hcd_read(hcd, HC_CHIP_ID_LOW);
+ chip_rev = isp1760_hcd_read(hcd, HC_CHIP_REV);
+ dev_info(hcd->self.controller, "USB ISP %02x%02x HW rev. %d started\n",
+ chipid_h, chipid_l, chip_rev);
+
+ isp1760_hcd_clear(hcd, ISO_BUF_FILL);
+ isp1760_hcd_clear(hcd, INT_BUF_FILL);
+ isp1760_hcd_clear(hcd, ATL_BUF_FILL);
+
+ isp1760_hcd_set(hcd, HC_ATL_PTD_SKIPMAP);
+ isp1760_hcd_set(hcd, HC_INT_PTD_SKIPMAP);
+ isp1760_hcd_set(hcd, HC_ISO_PTD_SKIPMAP);
+ ndelay(100);
+ isp1760_hcd_clear(hcd, HC_ATL_PTD_DONEMAP);
+ isp1760_hcd_clear(hcd, HC_INT_PTD_DONEMAP);
+ isp1760_hcd_clear(hcd, HC_ISO_PTD_DONEMAP);
+
+ isp1760_hcd_set(hcd, HW_OTG_DISABLE);
+ isp1760_reg_write(priv->regs, ISP1763_HC_OTG_CTRL_CLEAR, (1 << 7));
+ isp1760_reg_write(priv->regs, ISP1763_HC_OTG_CTRL_CLEAR, (1 << 15));
+ mdelay(10);
+
+ isp1760_hcd_set(hcd, HC_INT_IRQ_ENABLE);
+ isp1760_hcd_set(hcd, HC_ATL_IRQ_ENABLE);
+
+ isp1760_hcd_set(hcd, HW_GLOBAL_INTR_EN);
+
+ isp1760_hcd_clear(hcd, HC_ATL_IRQ_MASK_AND);
+ isp1760_hcd_clear(hcd, HC_INT_IRQ_MASK_AND);
+ isp1760_hcd_clear(hcd, HC_ISO_IRQ_MASK_AND);
+
+ isp1760_hcd_set(hcd, HC_ATL_IRQ_MASK_OR);
+ isp1760_hcd_set(hcd, HC_INT_IRQ_MASK_OR);
+ isp1760_hcd_set(hcd, HC_ISO_IRQ_MASK_OR);
+
+ ptd_atl_int = 0x8000;
+ ptd_iso = 0x0001;
+
+ isp1760_hcd_write(hcd, HC_ATL_PTD_LASTPTD, ptd_atl_int);
+ isp1760_hcd_write(hcd, HC_INT_PTD_LASTPTD, ptd_atl_int);
+ isp1760_hcd_write(hcd, HC_ISO_PTD_LASTPTD, ptd_iso);
+
+ isp1760_hcd_set(hcd, ATL_BUF_FILL);
+ isp1760_hcd_set(hcd, INT_BUF_FILL);
+
+ isp1760_hcd_clear(hcd, CMD_LRESET);
+ isp1760_hcd_clear(hcd, CMD_RESET);
+
+ retval = isp1760_hcd_set_and_wait(hcd, CMD_RUN, 250 * 1000);
+ if (retval)
+ return retval;
+
+ down_write(&ehci_cf_port_reset_rwsem);
+ retval = isp1760_hcd_set_and_wait(hcd, FLAG_CF, 250 * 1000);
+ up_write(&ehci_cf_port_reset_rwsem);
+ retval = 0;
+ if (retval)
+ return retval;
+
+ return 0;
+}
+
static int isp1760_run(struct usb_hcd *hcd)
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
int retval;
- u32 chipid;
+ u32 chipid_h;
+ u32 chipid_l;
+ u32 chip_rev;
+ u32 ptd_atl_int;
+ u32 ptd_iso;
+
+ /*
+ * ISP1763 have some differences in the setup and order to enable
+ * the ports, disable otg, setup buffers, and ATL, INT, ISO status.
+ * So, just handle it a separate sequence.
+ */
+ if (priv->is_isp1763)
+ return isp1763_run(hcd);
hcd->uses_new_polling = 1;
hcd->state = HC_STATE_RUNNING;
/* Set PTD interrupt AND & OR maps */
- isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_AND, 0);
- isp1760_reg_write(priv->regs, ISP176x_HC_ATL_IRQ_MASK_OR, 0xffffffff);
- isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_AND, 0);
- isp1760_reg_write(priv->regs, ISP176x_HC_INT_IRQ_MASK_OR, 0xffffffff);
- isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_AND, 0);
- isp1760_reg_write(priv->regs, ISP176x_HC_ISO_IRQ_MASK_OR, 0xffffffff);
+ isp1760_hcd_clear(hcd, HC_ATL_IRQ_MASK_AND);
+ isp1760_hcd_clear(hcd, HC_INT_IRQ_MASK_AND);
+ isp1760_hcd_clear(hcd, HC_ISO_IRQ_MASK_AND);
+
+ isp1760_hcd_set(hcd, HC_ATL_IRQ_MASK_OR);
+ isp1760_hcd_set(hcd, HC_INT_IRQ_MASK_OR);
+ isp1760_hcd_set(hcd, HC_ISO_IRQ_MASK_OR);
+
/* step 23 passed */
isp1760_hcd_set(hcd, HW_GLOBAL_INTR_EN);
@@ -1346,7 +1659,7 @@ static int isp1760_run(struct usb_hcd *hcd)
isp1760_hcd_clear(hcd, CMD_LRESET);
isp1760_hcd_clear(hcd, CMD_RESET);
- retval = isp1760_hcd_set_poll_timeout(hcd, CMD_RUN, 250 * 1000);
+ retval = isp1760_hcd_set_and_wait(hcd, CMD_RUN, 250 * 1000);
if (retval)
return retval;
@@ -1357,7 +1670,7 @@ static int isp1760_run(struct usb_hcd *hcd)
*/
down_write(&ehci_cf_port_reset_rwsem);
- retval = isp1760_hcd_set_poll_timeout(hcd, FLAG_CF, 250 * 1000);
+ retval = isp1760_hcd_set_and_wait(hcd, FLAG_CF, 250 * 1000);
up_write(&ehci_cf_port_reset_rwsem);
if (retval)
return retval;
@@ -1367,19 +1680,25 @@ static int isp1760_run(struct usb_hcd *hcd)
errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
add_timer(&errata2_timer);
- chipid = isp1760_reg_read(priv->regs, ISP176x_HC_CHIP_ID);
- dev_info(hcd->self.controller, "USB ISP %04x HW rev. %d started\n",
- chipid & 0xffff, chipid >> 16);
+ chipid_h = isp1760_hcd_read(hcd, HC_CHIP_ID_HIGH);
+ chipid_l = isp1760_hcd_read(hcd, HC_CHIP_ID_LOW);
+ chip_rev = isp1760_hcd_read(hcd, HC_CHIP_REV);
+ dev_info(hcd->self.controller, "USB ISP %02x%02x HW rev. %d started\n",
+ chipid_h, chipid_l, chip_rev);
/* PTD Register Init Part 2, Step 28 */
/* Setup registers controlling PTD checking */
- isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_LASTPTD, 0x80000000);
- isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_LASTPTD, 0x80000000);
- isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_LASTPTD, 0x00000001);
- isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP, 0xffffffff);
- isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP, 0xffffffff);
- isp1760_reg_write(priv->regs, ISP176x_HC_ISO_PTD_SKIPMAP, 0xffffffff);
+ ptd_atl_int = 0x80000000;
+ ptd_iso = 0x00000001;
+
+ isp1760_hcd_write(hcd, HC_ATL_PTD_LASTPTD, ptd_atl_int);
+ isp1760_hcd_write(hcd, HC_INT_PTD_LASTPTD, ptd_atl_int);
+ isp1760_hcd_write(hcd, HC_ISO_PTD_LASTPTD, ptd_iso);
+
+ isp1760_hcd_set(hcd, HC_ATL_PTD_SKIPMAP);
+ isp1760_hcd_set(hcd, HC_INT_PTD_SKIPMAP);
+ isp1760_hcd_set(hcd, HC_ISO_PTD_SKIPMAP);
isp1760_hcd_set(hcd, ATL_BUF_FILL);
isp1760_hcd_set(hcd, INT_BUF_FILL);
@@ -1620,19 +1939,16 @@ static void kill_transfer(struct usb_hcd *hcd, struct urb *urb,
/* We need to forcefully reclaim the slot since some transfers never
return, e.g. interrupt transfers and NAKed bulk transfers. */
if (usb_pipecontrol(urb->pipe) || usb_pipebulk(urb->pipe)) {
- skip_map = isp1760_reg_read(priv->regs,
- ISP176x_HC_ATL_PTD_SKIPMAP);
+ skip_map = isp1760_hcd_read(hcd, HC_ATL_PTD_SKIPMAP);
skip_map |= (1 << qh->slot);
- isp1760_reg_write(priv->regs, ISP176x_HC_ATL_PTD_SKIPMAP,
- skip_map);
+ isp1760_hcd_write(hcd, HC_ATL_PTD_SKIPMAP, skip_map);
+ ndelay(100);
priv->atl_slots[qh->slot].qh = NULL;
priv->atl_slots[qh->slot].qtd = NULL;
} else {
- skip_map = isp1760_reg_read(priv->regs,
- ISP176x_HC_INT_PTD_SKIPMAP);
+ skip_map = isp1760_hcd_read(hcd, HC_INT_PTD_SKIPMAP);
skip_map |= (1 << qh->slot);
- isp1760_reg_write(priv->regs, ISP176x_HC_INT_PTD_SKIPMAP,
- skip_map);
+ isp1760_hcd_write(hcd, HC_INT_PTD_SKIPMAP, skip_map);
priv->int_slots[qh->slot].qh = NULL;
priv->int_slots[qh->slot].qtd = NULL;
}
@@ -1788,7 +2104,7 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
int ports;
u16 temp;
- ports = isp1760_hcd_read(priv->hcd, HCS_N_PORTS);
+ ports = isp1760_hcd_n_ports(priv->hcd);
desc->bDescriptorType = USB_DT_HUB;
/* priv 1.0, 2.3.9 says 20ms max */
@@ -1805,7 +2121,7 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
/* per-port overcurrent reporting */
temp = HUB_CHAR_INDV_PORT_OCPM;
- if (isp1760_hcd_is_set(priv->hcd, HCS_PPC))
+ if (isp1760_hcd_ppc_is_set(priv->hcd))
/* per-port power control */
temp |= HUB_CHAR_INDV_PORT_LPSM;
else
@@ -1842,11 +2158,12 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
{
struct isp1760_hcd *priv = hcd_to_priv(hcd);
u32 status;
+ u32 temp;
unsigned long flags;
int retval = 0;
int ports;
- ports = isp1760_hcd_read(hcd, HCS_N_PORTS);
+ ports = isp1760_hcd_n_ports(hcd);
/*
* FIXME: support SetPortFeatures USB_PORT_FEAT_INDICATOR.
@@ -1905,7 +2222,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
/* we auto-clear this feature */
break;
case USB_PORT_FEAT_POWER:
- if (isp1760_hcd_is_set(hcd, HCS_PPC))
+ if (isp1760_hcd_ppc_is_set(hcd))
isp1760_hcd_clear(hcd, PORT_POWER);
break;
case USB_PORT_FEAT_C_CONNECTION:
@@ -1920,7 +2237,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
default:
goto error;
}
- isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
+ isp1760_hcd_read(hcd, CMD_RUN);
break;
case GetHubDescriptor:
isp1760_hub_descriptor(priv, (struct usb_hub_descriptor *)
@@ -1940,7 +2257,6 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
if (isp1760_hcd_is_set(hcd, PORT_CSC))
status |= USB_PORT_STAT_C_CONNECTION << 16;
-
/* whoever resumes must GetPortStatus to complete it!! */
if (isp1760_hcd_is_set(hcd, PORT_RESUME)) {
dev_err(hcd->self.controller, "Port resume should be skipped.\n");
@@ -1963,7 +2279,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
/* stop resume signaling */
isp1760_hcd_clear(hcd, PORT_CSC);
- retval = isp1760_hcd_clear_poll_timeout(hcd,
+ retval = isp1760_hcd_clear_and_wait(hcd,
PORT_RESUME, 2000);
if (retval != 0) {
dev_err(hcd->self.controller,
@@ -1984,8 +2300,8 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
/* REVISIT: some hardware needs 550+ usec to clear
* this bit; seems too long to spin routinely...
*/
- retval = isp1760_hcd_clear_poll_timeout(hcd, PORT_RESET,
- 750);
+ retval = isp1760_hcd_clear_and_wait(hcd, PORT_RESET,
+ 750);
if (retval != 0) {
dev_err(hcd->self.controller, "port %d reset error %d\n",
wIndex + 1, retval);
@@ -2036,6 +2352,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
if (!wIndex || wIndex > ports)
goto error;
wIndex--;
+
if (isp1760_hcd_is_set(hcd, PORT_OWNER))
break;
@@ -2052,7 +2369,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
isp1760_hcd_set(hcd, PORT_SUSPEND);
break;
case USB_PORT_FEAT_POWER:
- if (isp1760_hcd_is_set(hcd, HCS_PPC))
+ if (isp1760_hcd_ppc_is_set(hcd))
isp1760_hcd_set(hcd, PORT_POWER);
break;
case USB_PORT_FEAT_RESET:
@@ -2067,21 +2384,34 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
(isp1760_hcd_read(hcd, PORT_LSTATUS) == 1)) {
isp1760_hcd_set(hcd, PORT_OWNER);
} else {
- isp1760_hcd_set(hcd, PORT_RESET);
- isp1760_hcd_clear(hcd, PORT_PE);
+ temp = isp1760_reg_read(priv->regs, ISP1763_HC_PORTSC1);
+ temp |= (1 << 8);
+ temp &= ~(1 << 2);
+ writel(temp, priv->base + ISP1763_HC_PORTSC1);
/*
* caller must wait, then call GetPortStatus
* usb 2.0 spec says 50 ms resets on root
*/
priv->reset_done = jiffies +
msecs_to_jiffies(50);
+
+ mdelay(50);
+
+ temp &= ~(1 << 8);
+ writel(temp, priv->base + ISP1763_HC_PORTSC1);
+
+ while (readl(priv->base + ISP1763_HC_PORTSC1) & (1 << 8))
+ continue;
+
+ temp |= (1 << 2);
+ writel(temp, priv->base + ISP1763_HC_PORTSC1);
}
break;
default:
goto error;
}
- isp1760_reg_read(priv->regs, ISP176x_HC_USBCMD);
+ isp1760_reg_read(priv->regs, ISP1763_HC_USBCMD);
break;
default:
@@ -2216,22 +2546,14 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
priv->hcd = hcd;
- priv->memory_pool = kcalloc(mem_layout->payload_blocks,
- sizeof(struct isp1760_memory_chunk),
- GFP_KERNEL);
- if (!priv->memory_pool) {
- ret = -ENOMEM;
- goto put_hcd;
- }
-
- priv->atl_slots = kcalloc(mem_layout->ptd_num,
+ priv->atl_slots = kcalloc(mem_layout->slot_num,
sizeof(struct isp1760_slotinfo), GFP_KERNEL);
if (!priv->atl_slots) {
ret = -ENOMEM;
- goto free_mem_pool;
+ goto put_hcd;
}
- priv->int_slots = kcalloc(mem_layout->ptd_num,
+ priv->int_slots = kcalloc(mem_layout->slot_num,
sizeof(struct isp1760_slotinfo), GFP_KERNEL);
if (!priv->int_slots) {
ret = -ENOMEM;
@@ -2259,8 +2581,6 @@ int isp1760_hcd_register(struct isp1760_hcd *priv, struct resource *mem,
kfree(priv->int_slots);
free_atl_slots:
kfree(priv->atl_slots);
-free_mem_pool:
- kfree(priv->memory_pool);
put_hcd:
usb_put_hcd(hcd);
return ret;
@@ -2275,5 +2595,4 @@ void isp1760_hcd_unregister(struct isp1760_hcd *priv)
usb_put_hcd(priv->hcd);
kfree(priv->atl_slots);
kfree(priv->int_slots);
- kfree(priv->memory_pool);
}
diff --git a/drivers/usb/isp1760/isp1760-hcd.h b/drivers/usb/isp1760/isp1760-hcd.h
index 9d2427ce3f1a..ee3063a34de3 100644
--- a/drivers/usb/isp1760/isp1760-hcd.h
+++ b/drivers/usb/isp1760/isp1760-hcd.h
@@ -19,13 +19,14 @@ struct isp1760_slotinfo {
};
/* chip memory management */
+#define ISP176x_BLOCK_MAX (32 + 20 + 4)
#define ISP176x_BLOCK_NUM 3
struct isp1760_memory_layout {
unsigned int blocks[ISP176x_BLOCK_NUM];
unsigned int blocks_size[ISP176x_BLOCK_NUM];
- unsigned int ptd_num;
+ unsigned int slot_num;
unsigned int payload_blocks;
unsigned int payload_area_size;
};
@@ -51,6 +52,7 @@ struct isp1760_hcd {
struct regmap *regs;
struct regmap_field *fields[HC_FIELD_MAX];
+ bool is_isp1763;
const struct isp1760_memory_layout *memory_layout;
spinlock_t lock;
@@ -58,7 +60,7 @@ struct isp1760_hcd {
int atl_done_map;
struct isp1760_slotinfo *int_slots;
int int_done_map;
- struct isp1760_memory_chunk *memory_pool;
+ struct isp1760_memory_chunk memory_pool[ISP176x_BLOCK_MAX];
struct list_head qh_list[QH_END];
/* periodic schedule support */
diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index cb3e4d782315..7cc349c0b2ad 100644
--- a/drivers/usb/isp1760/isp1760-if.c
+++ b/drivers/usb/isp1760/isp1760-if.c
@@ -7,6 +7,7 @@
* - PDEV (generic platform device centralized driver model)
*
* (c) 2007 Sebastian Siewior <bigeasy@linutronix.de>
+ * Copyright 2021 Linaro, Rui Miguel Silva <rui.silva@linaro.org>
*
*/
@@ -209,10 +210,18 @@ static int isp1760_plat_probe(struct platform_device *pdev)
if (of_device_is_compatible(dp, "nxp,usb-isp1761"))
devflags |= ISP1760_FLAG_ISP1761;
- /* Some systems wire up only 16 of the 32 data lines */
+ if (of_device_is_compatible(dp, "nxp,usb-isp1763"))
+ devflags |= ISP1760_FLAG_ISP1763;
+
+ /*
+ * Some systems wire up only 8 of 16 data lines or
+ * 16 of the 32 data lines
+ */
of_property_read_u32(dp, "bus-width", &bus_width);
if (bus_width == 16)
devflags |= ISP1760_FLAG_BUS_WIDTH_16;
+ else if (bus_width == 8)
+ devflags |= ISP1760_FLAG_BUS_WIDTH_8;
if (usb_get_dr_mode(&pdev->dev) == USB_DR_MODE_PERIPHERAL)
devflags |= ISP1760_FLAG_PERIPHERAL_EN;
@@ -250,6 +259,7 @@ static int isp1760_plat_remove(struct platform_device *pdev)
static const struct of_device_id isp1760_of_match[] = {
{ .compatible = "nxp,usb-isp1760", },
{ .compatible = "nxp,usb-isp1761", },
+ { .compatible = "nxp,usb-isp1763", },
{ },
};
MODULE_DEVICE_TABLE(of, isp1760_of_match);
diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
index 42ee4404c90b..c98466f66cb6 100644
--- a/drivers/usb/isp1760/isp1760-regs.h
+++ b/drivers/usb/isp1760/isp1760-regs.h
@@ -2,12 +2,14 @@
/*
* Driver for the NXP ISP1760 chip
*
+ * Copyright 2021 Linaro, Rui Miguel Silva
* Copyright 2014 Laurent Pinchart
* Copyright 2007 Sebastian Siewior
*
* Contacts:
* Sebastian Siewior <bigeasy@linutronix.de>
* Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ * Rui Miguel Silva <rui.silva@linaro.org>
*/
#ifndef _ISP176x_REGS_H_
@@ -19,8 +21,8 @@
* Host Controller
*/
+/* ISP1760/31 */
/* EHCI capability registers */
-#define ISP176x_HC_CAPLENGTH 0x000
#define ISP176x_HC_VERSION 0x002
#define ISP176x_HC_HCSPARAMS 0x004
#define ISP176x_HC_HCCPARAMS 0x008
@@ -61,10 +63,13 @@
#define ISP176x_HC_INT_IRQ_MASK_AND 0x328
#define ISP176x_HC_ATL_IRQ_MASK_AND 0x32c
+#define ISP176x_HC_OTG_CTRL_SET 0x374
+#define ISP176x_HC_OTG_CTRL_CLEAR 0x376
+
static const struct regmap_range isp176x_hc_volatile_ranges[] = {
regmap_reg_range(ISP176x_HC_USBCMD, ISP176x_HC_ATL_PTD_LASTPTD),
regmap_reg_range(ISP176x_HC_BUFFER_STATUS, ISP176x_HC_MEMORY),
- regmap_reg_range(ISP176x_HC_INTERRUPT, ISP176x_HC_ATL_IRQ_MASK_AND),
+ regmap_reg_range(ISP176x_HC_INTERRUPT, ISP176x_HC_OTG_CTRL_CLEAR),
};
static const struct regmap_access_table isp176x_hc_volatile_table = {
@@ -73,6 +78,9 @@ static const struct regmap_access_table isp176x_hc_volatile_table = {
};
enum isp176x_host_controller_fields {
+ /* HC_PORTSC1 */
+ PORT_OWNER, PORT_POWER, PORT_LSTATUS, PORT_RESET, PORT_SUSPEND,
+ PORT_RESUME, PORT_PE, PORT_CSC, PORT_CONNECT,
/* HC_HCSPARAMS */
HCS_PPC, HCS_N_PORTS,
/* HC_HCCPARAMS */
@@ -85,21 +93,40 @@ enum isp176x_host_controller_fields {
HC_FRINDEX,
/* HC_CONFIGFLAG */
FLAG_CF,
- /* HC_PORTSC1 */
- PORT_OWNER, PORT_POWER, PORT_LSTATUS, PORT_RESET, PORT_SUSPEND,
- PORT_RESUME, PORT_PE, PORT_CSC, PORT_CONNECT,
+ /* ISO/INT/ATL PTD */
+ HC_ISO_PTD_DONEMAP, HC_ISO_PTD_SKIPMAP, HC_ISO_PTD_LASTPTD,
+ HC_INT_PTD_DONEMAP, HC_INT_PTD_SKIPMAP, HC_INT_PTD_LASTPTD,
+ HC_ATL_PTD_DONEMAP, HC_ATL_PTD_SKIPMAP, HC_ATL_PTD_LASTPTD,
/* HC_HW_MODE_CTRL */
ALL_ATX_RESET, HW_ANA_DIGI_OC, HW_DEV_DMA, HW_COMN_IRQ, HW_COMN_DMA,
HW_DATA_BUS_WIDTH, HW_DACK_POL_HIGH, HW_DREQ_POL_HIGH, HW_INTR_HIGH_ACT,
- HW_INTR_EDGE_TRIG, HW_GLOBAL_INTR_EN,
+ HW_INTF_LOCK, HW_INTR_EDGE_TRIG, HW_GLOBAL_INTR_EN,
+ /* HC_CHIP_ID */
+ HC_CHIP_ID_HIGH, HC_CHIP_ID_LOW, HC_CHIP_REV,
+ /* HC_SCRATCH */
+ HC_SCRATCH,
/* HC_RESET */
- SW_RESET_RESET_HC, SW_RESET_RESET_ALL,
+ SW_RESET_RESET_ATX, SW_RESET_RESET_HC, SW_RESET_RESET_ALL,
/* HC_BUFFER_STATUS */
- INT_BUF_FILL, ATL_BUF_FILL,
+ ISO_BUF_FILL, INT_BUF_FILL, ATL_BUF_FILL,
/* HC_MEMORY */
MEM_BANK_SEL, MEM_START_ADDR,
+ /* HC_DATA */
+ HC_DATA,
+ /* HC_INTERRUPT */
+ HC_INTERRUPT,
/* HC_INTERRUPT_ENABLE */
- HC_INT_ENABLE,
+ HC_INT_IRQ_ENABLE, HC_ATL_IRQ_ENABLE,
+ /* INTERRUPT MASKS */
+ HC_ISO_IRQ_MASK_OR, HC_INT_IRQ_MASK_OR, HC_ATL_IRQ_MASK_OR,
+ HC_ISO_IRQ_MASK_AND, HC_INT_IRQ_MASK_AND, HC_ATL_IRQ_MASK_AND,
+ /* HW_OTG_CTRL_SET */
+ HW_OTG_DISABLE, HW_SW_SEL_HC_DC, HW_VBUS_DRV, HW_SEL_CP_EXT,
+ HW_DM_PULLDOWN, HW_DP_PULLDOWN, HW_DP_PULLUP, HW_HC_2_DIS,
+ /* HW_OTG_CTRL_CLR */
+ HW_OTG_DISABLE_CLEAR, HW_SW_SEL_HC_DC_CLEAR, HW_VBUS_DRV_CLEAR,
+ HW_SEL_CP_EXT_CLEAR, HW_DM_PULLDOWN_CLEAR, HW_DP_PULLDOWN_CLEAR,
+ HW_DP_PULLUP_CLEAR, HW_HC_2_DIS_CLEAR,
/* Last element */
HC_FIELD_MAX,
};
@@ -115,6 +142,15 @@ static const struct reg_field isp1760_hc_reg_fields[] = {
[STS_PCD] = REG_FIELD(ISP176x_HC_USBSTS, 2, 2),
[HC_FRINDEX] = REG_FIELD(ISP176x_HC_FRINDEX, 0, 13),
[FLAG_CF] = REG_FIELD(ISP176x_HC_CONFIGFLAG, 0, 0),
+ [HC_ISO_PTD_DONEMAP] = REG_FIELD(ISP176x_HC_ISO_PTD_DONEMAP, 0, 31),
+ [HC_ISO_PTD_SKIPMAP] = REG_FIELD(ISP176x_HC_ISO_PTD_SKIPMAP, 0, 31),
+ [HC_ISO_PTD_LASTPTD] = REG_FIELD(ISP176x_HC_ISO_PTD_LASTPTD, 0, 31),
+ [HC_INT_PTD_DONEMAP] = REG_FIELD(ISP176x_HC_INT_PTD_DONEMAP, 0, 31),
+ [HC_INT_PTD_SKIPMAP] = REG_FIELD(ISP176x_HC_INT_PTD_SKIPMAP, 0, 31),
+ [HC_INT_PTD_LASTPTD] = REG_FIELD(ISP176x_HC_INT_PTD_LASTPTD, 0, 31),
+ [HC_ATL_PTD_DONEMAP] = REG_FIELD(ISP176x_HC_ATL_PTD_DONEMAP, 0, 31),
+ [HC_ATL_PTD_SKIPMAP] = REG_FIELD(ISP176x_HC_ATL_PTD_SKIPMAP, 0, 31),
+ [HC_ATL_PTD_LASTPTD] = REG_FIELD(ISP176x_HC_ATL_PTD_LASTPTD, 0, 31),
[PORT_OWNER] = REG_FIELD(ISP176x_HC_PORTSC1, 13, 13),
[PORT_POWER] = REG_FIELD(ISP176x_HC_PORTSC1, 12, 12),
[PORT_LSTATUS] = REG_FIELD(ISP176x_HC_PORTSC1, 10, 11),
@@ -133,12 +169,174 @@ static const struct reg_field isp1760_hc_reg_fields[] = {
[HW_INTR_HIGH_ACT] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 2, 2),
[HW_INTR_EDGE_TRIG] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 1, 1),
[HW_GLOBAL_INTR_EN] = REG_FIELD(ISP176x_HC_HW_MODE_CTRL, 0, 0),
+ [HC_CHIP_REV] = REG_FIELD(ISP176x_HC_CHIP_ID, 16, 31),
+ [HC_CHIP_ID_HIGH] = REG_FIELD(ISP176x_HC_CHIP_ID, 8, 15),
+ [HC_CHIP_ID_LOW] = REG_FIELD(ISP176x_HC_CHIP_ID, 0, 7),
+ [HC_SCRATCH] = REG_FIELD(ISP176x_HC_SCRATCH, 0, 31),
[SW_RESET_RESET_ALL] = REG_FIELD(ISP176x_HC_RESET, 0, 0),
+ [ISO_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 2, 2),
[INT_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 1, 1),
[ATL_BUF_FILL] = REG_FIELD(ISP176x_HC_BUFFER_STATUS, 0, 0),
[MEM_BANK_SEL] = REG_FIELD(ISP176x_HC_MEMORY, 16, 17),
[MEM_START_ADDR] = REG_FIELD(ISP176x_HC_MEMORY, 0, 15),
- [HC_INT_ENABLE] = REG_FIELD(ISP176x_HC_INTERRUPT_ENABLE, 7, 8),
+ [HC_INTERRUPT] = REG_FIELD(ISP176x_HC_INTERRUPT, 0, 9),
+ [HC_ATL_IRQ_ENABLE] = REG_FIELD(ISP176x_HC_INTERRUPT_ENABLE, 8, 8),
+ [HC_INT_IRQ_ENABLE] = REG_FIELD(ISP176x_HC_INTERRUPT_ENABLE, 7, 7),
+ [HC_ISO_IRQ_MASK_OR] = REG_FIELD(ISP176x_HC_ISO_IRQ_MASK_OR, 0, 31),
+ [HC_INT_IRQ_MASK_OR] = REG_FIELD(ISP176x_HC_INT_IRQ_MASK_OR, 0, 31),
+ [HC_ATL_IRQ_MASK_OR] = REG_FIELD(ISP176x_HC_ATL_IRQ_MASK_OR, 0, 31),
+ [HC_ISO_IRQ_MASK_AND] = REG_FIELD(ISP176x_HC_ISO_IRQ_MASK_AND, 0, 31),
+ [HC_INT_IRQ_MASK_AND] = REG_FIELD(ISP176x_HC_INT_IRQ_MASK_AND, 0, 31),
+ [HC_ATL_IRQ_MASK_AND] = REG_FIELD(ISP176x_HC_ATL_IRQ_MASK_AND, 0, 31),
+ [HW_OTG_DISABLE] = REG_FIELD(ISP176x_HC_OTG_CTRL_SET, 10, 10),
+ [HW_SW_SEL_HC_DC] = REG_FIELD(ISP176x_HC_OTG_CTRL_SET, 7, 7),
+ [HW_VBUS_DRV] = REG_FIELD(ISP176x_HC_OTG_CTRL_SET, 4, 4),
+ [HW_SEL_CP_EXT] = REG_FIELD(ISP176x_HC_OTG_CTRL_SET, 3, 3),
+ [HW_DM_PULLDOWN] = REG_FIELD(ISP176x_HC_OTG_CTRL_SET, 2, 2),
+ [HW_DP_PULLDOWN] = REG_FIELD(ISP176x_HC_OTG_CTRL_SET, 1, 1),
+ [HW_DP_PULLUP] = REG_FIELD(ISP176x_HC_OTG_CTRL_SET, 0, 0),
+ [HW_OTG_DISABLE_CLEAR] = REG_FIELD(ISP176x_HC_OTG_CTRL_CLEAR, 10, 10),
+ [HW_SW_SEL_HC_DC_CLEAR] = REG_FIELD(ISP176x_HC_OTG_CTRL_CLEAR, 7, 7),
+ [HW_VBUS_DRV_CLEAR] = REG_FIELD(ISP176x_HC_OTG_CTRL_CLEAR, 4, 4),
+ [HW_SEL_CP_EXT_CLEAR] = REG_FIELD(ISP176x_HC_OTG_CTRL_CLEAR, 3, 3),
+ [HW_DM_PULLDOWN_CLEAR] = REG_FIELD(ISP176x_HC_OTG_CTRL_CLEAR, 2, 2),
+ [HW_DP_PULLDOWN_CLEAR] = REG_FIELD(ISP176x_HC_OTG_CTRL_CLEAR, 1, 1),
+ [HW_DP_PULLUP_CLEAR] = REG_FIELD(ISP176x_HC_OTG_CTRL_CLEAR, 0, 0),
+};
+
+/* ISP1763 */
+/* EHCI operational registers */
+#define ISP1763_HC_USBCMD 0x8c
+#define ISP1763_HC_USBSTS 0x90
+#define ISP1763_HC_FRINDEX 0x98
+
+#define ISP1763_HC_CONFIGFLAG 0x9c
+#define ISP1763_HC_PORTSC1 0xa0
+
+#define ISP1763_HC_ISO_PTD_DONEMAP 0xa4
+#define ISP1763_HC_ISO_PTD_SKIPMAP 0xa6
+#define ISP1763_HC_ISO_PTD_LASTPTD 0xa8
+#define ISP1763_HC_INT_PTD_DONEMAP 0xaa
+#define ISP1763_HC_INT_PTD_SKIPMAP 0xac
+#define ISP1763_HC_INT_PTD_LASTPTD 0xae
+#define ISP1763_HC_ATL_PTD_DONEMAP 0xb0
+#define ISP1763_HC_ATL_PTD_SKIPMAP 0xb2
+#define ISP1763_HC_ATL_PTD_LASTPTD 0xb4
+
+/* Configuration Register */
+#define ISP1763_HC_HW_MODE_CTRL 0xb6
+#define ISP1763_HC_CHIP_REV 0x70
+#define ISP1763_HC_CHIP_ID 0x72
+#define ISP1763_HC_SCRATCH 0x78
+#define ISP1763_HC_RESET 0xb8
+#define ISP1763_HC_BUFFER_STATUS 0xba
+#define ISP1763_HC_MEMORY 0xc4
+#define ISP1763_HC_DATA 0xc6
+
+/* Interrupt Register */
+#define ISP1763_HC_INTERRUPT 0xd4
+#define ISP1763_HC_INTERRUPT_ENABLE 0xd6
+#define ISP1763_HC_ISO_IRQ_MASK_OR 0xd8
+#define ISP1763_HC_INT_IRQ_MASK_OR 0xda
+#define ISP1763_HC_ATL_IRQ_MASK_OR 0xdc
+#define ISP1763_HC_ISO_IRQ_MASK_AND 0xde
+#define ISP1763_HC_INT_IRQ_MASK_AND 0xe0
+#define ISP1763_HC_ATL_IRQ_MASK_AND 0xe2
+
+#define ISP1763_HC_OTG_CTRL_SET 0xe4
+#define ISP1763_HC_OTG_CTRL_CLEAR 0xe6
+
+static const struct reg_field isp1763_hc_reg_fields[] = {
+ [CMD_LRESET] = REG_FIELD(ISP1763_HC_USBCMD, 7, 7),
+ [CMD_RESET] = REG_FIELD(ISP1763_HC_USBCMD, 1, 1),
+ [CMD_RUN] = REG_FIELD(ISP1763_HC_USBCMD, 0, 0),
+ [STS_PCD] = REG_FIELD(ISP1763_HC_USBSTS, 2, 2),
+ [HC_FRINDEX] = REG_FIELD(ISP1763_HC_FRINDEX, 0, 13),
+ [FLAG_CF] = REG_FIELD(ISP1763_HC_CONFIGFLAG, 0, 0),
+ [HC_ISO_PTD_DONEMAP] = REG_FIELD(ISP1763_HC_ISO_PTD_DONEMAP, 0, 15),
+ [HC_ISO_PTD_SKIPMAP] = REG_FIELD(ISP1763_HC_ISO_PTD_SKIPMAP, 0, 15),
+ [HC_ISO_PTD_LASTPTD] = REG_FIELD(ISP1763_HC_ISO_PTD_LASTPTD, 0, 15),
+ [HC_INT_PTD_DONEMAP] = REG_FIELD(ISP1763_HC_INT_PTD_DONEMAP, 0, 15),
+ [HC_INT_PTD_SKIPMAP] = REG_FIELD(ISP1763_HC_INT_PTD_SKIPMAP, 0, 15),
+ [HC_INT_PTD_LASTPTD] = REG_FIELD(ISP1763_HC_INT_PTD_LASTPTD, 0, 15),
+ [HC_ATL_PTD_DONEMAP] = REG_FIELD(ISP1763_HC_ATL_PTD_DONEMAP, 0, 15),
+ [HC_ATL_PTD_SKIPMAP] = REG_FIELD(ISP1763_HC_ATL_PTD_SKIPMAP, 0, 15),
+ [HC_ATL_PTD_LASTPTD] = REG_FIELD(ISP1763_HC_ATL_PTD_LASTPTD, 0, 15),
+ [PORT_OWNER] = REG_FIELD(ISP1763_HC_PORTSC1, 13, 13),
+ [PORT_POWER] = REG_FIELD(ISP1763_HC_PORTSC1, 12, 12),
+ [PORT_LSTATUS] = REG_FIELD(ISP1763_HC_PORTSC1, 10, 11),
+ [PORT_RESET] = REG_FIELD(ISP1763_HC_PORTSC1, 8, 8),
+ [PORT_SUSPEND] = REG_FIELD(ISP1763_HC_PORTSC1, 7, 7),
+ [PORT_RESUME] = REG_FIELD(ISP1763_HC_PORTSC1, 6, 6),
+ [PORT_PE] = REG_FIELD(ISP1763_HC_PORTSC1, 2, 2),
+ [PORT_CSC] = REG_FIELD(ISP1763_HC_PORTSC1, 1, 1),
+ [PORT_CONNECT] = REG_FIELD(ISP1763_HC_PORTSC1, 0, 0),
+ [HW_DATA_BUS_WIDTH] = REG_FIELD(ISP1763_HC_HW_MODE_CTRL, 4, 4),
+ [HW_DACK_POL_HIGH] = REG_FIELD(ISP1763_HC_HW_MODE_CTRL, 6, 6),
+ [HW_DREQ_POL_HIGH] = REG_FIELD(ISP1763_HC_HW_MODE_CTRL, 5, 5),
+ [HW_INTF_LOCK] = REG_FIELD(ISP1763_HC_HW_MODE_CTRL, 3, 3),
+ [HW_INTR_HIGH_ACT] = REG_FIELD(ISP1763_HC_HW_MODE_CTRL, 2, 2),
+ [HW_INTR_EDGE_TRIG] = REG_FIELD(ISP1763_HC_HW_MODE_CTRL, 1, 1),
+ [HW_GLOBAL_INTR_EN] = REG_FIELD(ISP1763_HC_HW_MODE_CTRL, 0, 0),
+ [SW_RESET_RESET_ATX] = REG_FIELD(ISP1763_HC_RESET, 3, 3),
+ [SW_RESET_RESET_ALL] = REG_FIELD(ISP1763_HC_RESET, 0, 0),
+ [HC_CHIP_ID_HIGH] = REG_FIELD(ISP1763_HC_CHIP_ID, 0, 15),
+ [HC_CHIP_ID_LOW] = REG_FIELD(ISP1763_HC_CHIP_REV, 8, 15),
+ [HC_CHIP_REV] = REG_FIELD(ISP1763_HC_CHIP_REV, 0, 7),
+ [HC_SCRATCH] = REG_FIELD(ISP1763_HC_SCRATCH, 0, 15),
+ [ISO_BUF_FILL] = REG_FIELD(ISP1763_HC_BUFFER_STATUS, 2, 2),
+ [INT_BUF_FILL] = REG_FIELD(ISP1763_HC_BUFFER_STATUS, 1, 1),
+ [ATL_BUF_FILL] = REG_FIELD(ISP1763_HC_BUFFER_STATUS, 0, 0),
+ [MEM_START_ADDR] = REG_FIELD(ISP1763_HC_MEMORY, 0, 15),
+ [HC_DATA] = REG_FIELD(ISP1763_HC_DATA, 0, 15),
+ [HC_INTERRUPT] = REG_FIELD(ISP1763_HC_INTERRUPT, 0, 10),
+ [HC_ATL_IRQ_ENABLE] = REG_FIELD(ISP1763_HC_INTERRUPT_ENABLE, 8, 8),
+ [HC_INT_IRQ_ENABLE] = REG_FIELD(ISP1763_HC_INTERRUPT_ENABLE, 7, 7),
+ [HC_ISO_IRQ_MASK_OR] = REG_FIELD(ISP1763_HC_ISO_IRQ_MASK_OR, 0, 15),
+ [HC_INT_IRQ_MASK_OR] = REG_FIELD(ISP1763_HC_INT_IRQ_MASK_OR, 0, 15),
+ [HC_ATL_IRQ_MASK_OR] = REG_FIELD(ISP1763_HC_ATL_IRQ_MASK_OR, 0, 15),
+ [HC_ISO_IRQ_MASK_AND] = REG_FIELD(ISP1763_HC_ISO_IRQ_MASK_AND, 0, 15),
+ [HC_INT_IRQ_MASK_AND] = REG_FIELD(ISP1763_HC_INT_IRQ_MASK_AND, 0, 15),
+ [HC_ATL_IRQ_MASK_AND] = REG_FIELD(ISP1763_HC_ATL_IRQ_MASK_AND, 0, 15),
+ [HW_HC_2_DIS] = REG_FIELD(ISP1763_HC_OTG_CTRL_SET, 15, 15),
+ [HW_OTG_DISABLE] = REG_FIELD(ISP1763_HC_OTG_CTRL_SET, 10, 10),
+ [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1763_HC_OTG_CTRL_SET, 7, 7),
+ [HW_VBUS_DRV] = REG_FIELD(ISP1763_HC_OTG_CTRL_SET, 4, 4),
+ [HW_SEL_CP_EXT] = REG_FIELD(ISP1763_HC_OTG_CTRL_SET, 3, 3),
+ [HW_DM_PULLDOWN] = REG_FIELD(ISP1763_HC_OTG_CTRL_SET, 2, 2),
+ [HW_DP_PULLDOWN] = REG_FIELD(ISP1763_HC_OTG_CTRL_SET, 1, 1),
+ [HW_DP_PULLUP] = REG_FIELD(ISP1763_HC_OTG_CTRL_SET, 0, 0),
+ [HW_HC_2_DIS_CLEAR] = REG_FIELD(ISP1763_HC_OTG_CTRL_CLEAR, 15, 15),
+ [HW_OTG_DISABLE_CLEAR] = REG_FIELD(ISP1763_HC_OTG_CTRL_CLEAR, 10, 10),
+ [HW_SW_SEL_HC_DC_CLEAR] = REG_FIELD(ISP1763_HC_OTG_CTRL_CLEAR, 7, 7),
+ [HW_VBUS_DRV_CLEAR] = REG_FIELD(ISP1763_HC_OTG_CTRL_CLEAR, 4, 4),
+ [HW_SEL_CP_EXT_CLEAR] = REG_FIELD(ISP1763_HC_OTG_CTRL_CLEAR, 3, 3),
+ [HW_DM_PULLDOWN_CLEAR] = REG_FIELD(ISP1763_HC_OTG_CTRL_CLEAR, 2, 2),
+ [HW_DP_PULLDOWN_CLEAR] = REG_FIELD(ISP1763_HC_OTG_CTRL_CLEAR, 1, 1),
+ [HW_DP_PULLUP_CLEAR] = REG_FIELD(ISP1763_HC_OTG_CTRL_CLEAR, 0, 0),
+};
+
+static const struct regmap_range isp1763_hc_volatile_ranges[] = {
+ regmap_reg_range(ISP1763_HC_USBCMD, ISP1763_HC_ATL_PTD_LASTPTD),
+ regmap_reg_range(ISP1763_HC_BUFFER_STATUS, ISP1763_HC_DATA),
+ regmap_reg_range(ISP1763_HC_INTERRUPT, ISP1763_HC_OTG_CTRL_CLEAR),
+};
+
+static const struct regmap_access_table isp1763_hc_volatile_table = {
+ .yes_ranges = isp1763_hc_volatile_ranges,
+ .n_yes_ranges = ARRAY_SIZE(isp1763_hc_volatile_ranges),
+};
+
+static const u32 isp1763_hc_portsc1_fields[] = {
+ [PORT_OWNER] = BIT(13),
+ [PORT_POWER] = BIT(12),
+ [PORT_LSTATUS] = BIT(10),
+ [PORT_RESET] = BIT(8),
+ [PORT_SUSPEND] = BIT(7),
+ [PORT_RESUME] = BIT(6),
+ [PORT_PE] = BIT(2),
+ [PORT_CSC] = BIT(1),
+ [PORT_CONNECT] = BIT(0),
};
/* -----------------------------------------------------------------------------
@@ -171,9 +369,6 @@ static const struct reg_field isp1760_hc_reg_fields[] = {
#define ISP176x_DC_CTRLFUNC 0x0228
#define ISP176x_DC_EPINDEX 0x022c
-#define ISP1761_DC_OTG_CTRL_SET 0x374
-#define ISP1761_DC_OTG_CTRL_CLEAR 0x376
-
/* DMA Registers */
#define ISP176x_DC_DMACMD 0x0230
#define ISP176x_DC_DMATXCOUNT 0x0234
@@ -196,7 +391,6 @@ static const struct reg_field isp1760_hc_reg_fields[] = {
static const struct regmap_range isp176x_dc_volatile_ranges[] = {
regmap_reg_range(ISP176x_DC_EPMAXPKTSZ, ISP176x_DC_EPTYPE),
regmap_reg_range(ISP176x_DC_BUFLEN, ISP176x_DC_EPINDEX),
- regmap_reg_range(ISP1761_DC_OTG_CTRL_SET, ISP1761_DC_OTG_CTRL_CLEAR),
};
static const struct regmap_access_table isp176x_dc_volatile_table = {
@@ -227,13 +421,6 @@ enum isp176x_device_controller_fields {
DC_EPENABLE, DC_ENDPTYP,
/* DC_FRAMENUM */
DC_FRAMENUM, DC_UFRAMENUM,
- /* HW_OTG_CTRL_SET */
- HW_OTG_DISABLE, HW_SW_SEL_HC_DC, HW_VBUS_DRV, HW_SEL_CP_EXT,
- HW_DM_PULLDOWN, HW_DP_PULLDOWN, HW_DP_PULLUP,
- /* HW_OTG_CTRL_CLR */
- HW_OTG_DISABLE_CLEAR, HW_SW_SEL_HC_DC_CLEAR, HW_VBUS_DRV_CLEAR,
- HW_SEL_CP_EXT_CLEAR, HW_DM_PULLDOWN_CLEAR, HW_DP_PULLDOWN_CLEAR,
- HW_DP_PULLUP_CLEAR,
/* Last element */
DC_FIELD_MAX,
};
@@ -276,20 +463,6 @@ static const struct reg_field isp1761_dc_reg_fields[] = {
[DC_ENDPTYP] = REG_FIELD(ISP176x_DC_EPTYPE, 0, 1),
[DC_UFRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 11, 13),
[DC_FRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 0, 10),
- [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 10, 10),
- [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 7, 7),
- [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 4, 4),
- [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 3, 3),
- [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 2, 2),
- [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 1, 1),
- [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_SET, 0, 0),
- [HW_OTG_DISABLE] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 10, 10),
- [HW_SW_SEL_HC_DC] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 7, 7),
- [HW_VBUS_DRV] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 4, 4),
- [HW_SEL_CP_EXT] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 3, 3),
- [HW_DM_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 2, 2),
- [HW_DP_PULLDOWN] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 1, 1),
- [HW_DP_PULLUP] = REG_FIELD(ISP1761_DC_OTG_CTRL_CLEAR, 0, 0),
};
#endif
diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
index 1ce21ef291b6..980d51bff65e 100644
--- a/drivers/usb/isp1760/isp1760-udc.c
+++ b/drivers/usb/isp1760/isp1760-udc.c
@@ -2,10 +2,12 @@
/*
* Driver for the NXP ISP1761 device controller
*
+ * Copyright 2021 Linaro, Rui Miguel Silva
* Copyright 2014 Ideas on Board Oy
*
* Contacts:
* Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ * Rui Miguel Silva <rui.silva@linaro.org>
*/
#include <linux/interrupt.h>
diff --git a/drivers/usb/isp1760/isp1760-udc.h b/drivers/usb/isp1760/isp1760-udc.h
index a49096c0ac8e..f2ab5929cc9f 100644
--- a/drivers/usb/isp1760/isp1760-udc.h
+++ b/drivers/usb/isp1760/isp1760-udc.h
@@ -2,10 +2,12 @@
/*
* Driver for the NXP ISP1761 device controller
*
+ * Copyright 2021 Linaro, Rui Miguel Silva
* Copyright 2014 Ideas on Board Oy
*
* Contacts:
* Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ * Rui Miguel Silva <rui.silva@linaro.org>
*/
#ifndef _ISP1760_UDC_H_
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 5/7] usb: isp1760: add support for isp1763
2021-05-04 10:19 ` [PATCH 5/7] usb: isp1760: add support for isp1763 Rui Miguel Silva
@ 2021-05-04 11:53 ` kernel test robot
2021-05-06 16:50 ` kernel test robot
1 sibling, 0 replies; 25+ messages in thread
From: kernel test robot @ 2021-05-04 11:53 UTC (permalink / raw)
To: Rui Miguel Silva, Greg Kroah-Hartman, Sebastian Siewior,
Laurent Pinchart, Rob Herring
Cc: kbuild-all, linux-usb, devicetree, Rui Miguel Silva
[-- Attachment #1: Type: text/plain, Size: 13556 bytes --]
Hi Rui,
I love your patch! Perhaps something to improve:
[auto build test WARNING on usb/usb-testing]
[also build test WARNING on robh/for-next v5.12 next-20210504]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Rui-Miguel-Silva/usb-isp1760-extend-support-for-isp1763/20210504-182126
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: h8300-randconfig-s031-20210504 (attached as .config)
compiler: h8300-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.3-341-g8af24329-dirty
# https://github.com/0day-ci/linux/commit/e20d3193f1d1eef8bfdf1eb6a4001a916d4c463c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Rui-Miguel-Silva/usb-isp1760-extend-support-for-isp1763/20210504-182126
git checkout e20d3193f1d1eef8bfdf1eb6a4001a916d4c463c
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' W=1 ARCH=h8300
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
sparse warnings: (new ones prefixed by >>)
drivers/usb/isp1760/isp1760-hcd.c:300:32: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:300:32: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:300:32: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:300:32: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:300:32: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:300:32: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c: note: in included file (through include/linux/io.h, include/linux/irq.h, include/asm-generic/hardirq.h, ...):
arch/h8300/include/asm/io.h:26:18: sparse: sparse: cast removes address space '__iomem' of expression
drivers/usb/isp1760/isp1760-hcd.c:321:23: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:321:23: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:321:23: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:321:23: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:321:23: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:321:23: sparse: sparse: cast to restricted __le32
arch/h8300/include/asm/io.h:26:18: sparse: sparse: cast removes address space '__iomem' of expression
drivers/usb/isp1760/isp1760-hcd.c:397:38: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] b @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:397:38: sparse: expected unsigned int [usertype] b
drivers/usb/isp1760/isp1760-hcd.c:397:38: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:418:30: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] b @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:418:30: sparse: expected unsigned int [usertype] b
drivers/usb/isp1760/isp1760-hcd.c:418:30: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast to restricted __le32
>> drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast to restricted __le32
>> drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast to restricted __le32
>> drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast to restricted __le32
>> drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast to restricted __le32
>> drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast to restricted __le32
>> drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:487:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw0 @@ got unsigned int @@
drivers/usb/isp1760/isp1760-hcd.c:487:18: sparse: expected restricted __dw [usertype] dw0
drivers/usb/isp1760/isp1760-hcd.c:487:18: sparse: got unsigned int
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:488:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw1 @@ got unsigned int @@
drivers/usb/isp1760/isp1760-hcd.c:488:18: sparse: expected restricted __dw [usertype] dw1
drivers/usb/isp1760/isp1760-hcd.c:488:18: sparse: got unsigned int
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:489:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw2 @@ got unsigned int @@
drivers/usb/isp1760/isp1760-hcd.c:489:18: sparse: expected restricted __dw [usertype] dw2
drivers/usb/isp1760/isp1760-hcd.c:489:18: sparse: got unsigned int
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:490:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw3 @@ got unsigned int @@
drivers/usb/isp1760/isp1760-hcd.c:490:18: sparse: expected restricted __dw [usertype] dw3
drivers/usb/isp1760/isp1760-hcd.c:490:18: sparse: got unsigned int
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:491:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw4 @@ got unsigned int @@
drivers/usb/isp1760/isp1760-hcd.c:491:18: sparse: expected restricted __dw [usertype] dw4
drivers/usb/isp1760/isp1760-hcd.c:491:18: sparse: got unsigned int
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:492:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw5 @@ got unsigned int @@
drivers/usb/isp1760/isp1760-hcd.c:492:18: sparse: expected restricted __dw [usertype] dw5
drivers/usb/isp1760/isp1760-hcd.c:492:18: sparse: got unsigned int
drivers/usb/isp1760/isp1760-hcd.c:493:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:493:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:493:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:493:20: sparse: sparse: cast from restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:493:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:493:20: sparse: sparse: too many warnings
vim +487 drivers/usb/isp1760/isp1760-hcd.c
478
479 static void isp1763_ptd_read(struct usb_hcd *hcd, u32 ptd_offset, u32 slot,
480 struct ptd *ptd)
481 {
482 u16 src_offset = ptd_offset + slot * sizeof(*ptd);
483 struct ptd le32_ptd;
484
485 isp1763_mem_read(hcd, src_offset, (u16 *)&le32_ptd, sizeof(le32_ptd));
486 /* Normalize the data obtained */
> 487 ptd->dw0 = le32_to_cpu(le32_ptd.dw0);
488 ptd->dw1 = le32_to_cpu(le32_ptd.dw1);
> 489 ptd->dw2 = le32_to_cpu(le32_ptd.dw2);
> 490 ptd->dw3 = le32_to_cpu(le32_ptd.dw3);
> 491 ptd->dw4 = le32_to_cpu(le32_ptd.dw4);
> 492 ptd->dw5 = le32_to_cpu(le32_ptd.dw5);
493 ptd->dw6 = le32_to_cpu(le32_ptd.dw6);
494 ptd->dw7 = le32_to_cpu(le32_ptd.dw7);
495 }
496
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 26142 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 5/7] usb: isp1760: add support for isp1763
2021-05-04 10:19 ` [PATCH 5/7] usb: isp1760: add support for isp1763 Rui Miguel Silva
2021-05-04 11:53 ` kernel test robot
@ 2021-05-06 16:50 ` kernel test robot
1 sibling, 0 replies; 25+ messages in thread
From: kernel test robot @ 2021-05-06 16:50 UTC (permalink / raw)
To: Rui Miguel Silva, Greg Kroah-Hartman, Sebastian Siewior,
Laurent Pinchart, Rob Herring
Cc: kbuild-all, linux-usb, devicetree, Rui Miguel Silva
[-- Attachment #1: Type: text/plain, Size: 21836 bytes --]
Hi Rui,
I love your patch! Perhaps something to improve:
[auto build test WARNING on usb/usb-testing]
[also build test WARNING on robh/for-next v5.12 next-20210506]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Rui-Miguel-Silva/usb-isp1760-extend-support-for-isp1763/20210504-182126
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: x86_64-randconfig-s022-20210506 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce:
# apt-get install sparse
# sparse version: v0.6.3-341-g8af24329-dirty
# https://github.com/0day-ci/linux/commit/e20d3193f1d1eef8bfdf1eb6a4001a916d4c463c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Rui-Miguel-Silva/usb-isp1760-extend-support-for-isp1763/20210504-182126
git checkout e20d3193f1d1eef8bfdf1eb6a4001a916d4c463c
# save the attached .config to linux build tree
make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
sparse warnings: (new ones prefixed by >>)
drivers/usb/isp1760/isp1760-hcd.c:300:32: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:321:23: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:397:38: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int val @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:397:38: sparse: expected unsigned int val
drivers/usb/isp1760/isp1760-hcd.c:397:38: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:418:30: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int val @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:418:30: sparse: expected unsigned int val
drivers/usb/isp1760/isp1760-hcd.c:418:30: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:487:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:487:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw0 @@ got unsigned int [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:487:18: sparse: expected restricted __dw [usertype] dw0
drivers/usb/isp1760/isp1760-hcd.c:487:18: sparse: got unsigned int [usertype]
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:488:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:488:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw1 @@ got unsigned int [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:488:18: sparse: expected restricted __dw [usertype] dw1
drivers/usb/isp1760/isp1760-hcd.c:488:18: sparse: got unsigned int [usertype]
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:489:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:489:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw2 @@ got unsigned int [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:489:18: sparse: expected restricted __dw [usertype] dw2
drivers/usb/isp1760/isp1760-hcd.c:489:18: sparse: got unsigned int [usertype]
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:490:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:490:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw3 @@ got unsigned int [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:490:18: sparse: expected restricted __dw [usertype] dw3
drivers/usb/isp1760/isp1760-hcd.c:490:18: sparse: got unsigned int [usertype]
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:491:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:491:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw4 @@ got unsigned int [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:491:18: sparse: expected restricted __dw [usertype] dw4
drivers/usb/isp1760/isp1760-hcd.c:491:18: sparse: got unsigned int [usertype]
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:492:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:492:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw5 @@ got unsigned int [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:492:18: sparse: expected restricted __dw [usertype] dw5
drivers/usb/isp1760/isp1760-hcd.c:492:18: sparse: got unsigned int [usertype]
drivers/usb/isp1760/isp1760-hcd.c:493:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:493:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:493:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw6 @@ got unsigned int [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:493:18: sparse: expected restricted __dw [usertype] dw6
drivers/usb/isp1760/isp1760-hcd.c:493:18: sparse: got unsigned int [usertype]
drivers/usb/isp1760/isp1760-hcd.c:494:20: sparse: sparse: cast to restricted __le32
drivers/usb/isp1760/isp1760-hcd.c:494:20: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:494:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw7 @@ got unsigned int [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:494:18: sparse: expected restricted __dw [usertype] dw7
drivers/usb/isp1760/isp1760-hcd.c:494:18: sparse: got unsigned int [usertype]
drivers/usb/isp1760/isp1760-hcd.c:514:19: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:514:17: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw0 @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:514:17: sparse: expected restricted __dw [usertype] dw0
drivers/usb/isp1760/isp1760-hcd.c:514:17: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:515:19: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:515:17: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw1 @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:515:17: sparse: expected restricted __dw [usertype] dw1
drivers/usb/isp1760/isp1760-hcd.c:515:17: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:516:19: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:516:17: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw2 @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:516:17: sparse: expected restricted __dw [usertype] dw2
drivers/usb/isp1760/isp1760-hcd.c:516:17: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:517:19: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:517:17: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw3 @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:517:17: sparse: expected restricted __dw [usertype] dw3
drivers/usb/isp1760/isp1760-hcd.c:517:17: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:518:19: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:518:17: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw4 @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:518:17: sparse: expected restricted __dw [usertype] dw4
drivers/usb/isp1760/isp1760-hcd.c:518:17: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:519:19: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:519:17: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw5 @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:519:17: sparse: expected restricted __dw [usertype] dw5
drivers/usb/isp1760/isp1760-hcd.c:519:17: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:520:19: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:520:17: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw6 @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:520:17: sparse: expected restricted __dw [usertype] dw6
drivers/usb/isp1760/isp1760-hcd.c:520:17: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:521:19: sparse: sparse: cast from restricted __dw
>> drivers/usb/isp1760/isp1760-hcd.c:521:17: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw7 @@ got restricted __le32 [usertype] @@
drivers/usb/isp1760/isp1760-hcd.c:521:17: sparse: expected restricted __dw [usertype] dw7
drivers/usb/isp1760/isp1760-hcd.c:521:17: sparse: got restricted __le32 [usertype]
drivers/usb/isp1760/isp1760-hcd.c:536:65: sparse: sparse: incorrect type in argument 3 (different base types) @@ expected unsigned int const [usertype] *[assigned] src @@ got restricted __dw * @@
drivers/usb/isp1760/isp1760-hcd.c:536:65: sparse: expected unsigned int const [usertype] *[assigned] src
drivers/usb/isp1760/isp1760-hcd.c:536:65: sparse: got restricted __dw *
drivers/usb/isp1760/isp1760-hcd.c:539:46: sparse: sparse: incorrect type in argument 3 (different base types) @@ expected unsigned int const [usertype] *[assigned] src @@ got restricted __dw * @@
drivers/usb/isp1760/isp1760-hcd.c:539:46: sparse: expected unsigned int const [usertype] *[assigned] src
drivers/usb/isp1760/isp1760-hcd.c:539:46: sparse: got restricted __dw *
drivers/usb/isp1760/isp1760-hcd.c:802:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw0 @@ got int @@
drivers/usb/isp1760/isp1760-hcd.c:802:18: sparse: expected restricted __dw [usertype] dw0
drivers/usb/isp1760/isp1760-hcd.c:802:18: sparse: got int
drivers/usb/isp1760/isp1760-hcd.c:803:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:803:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:803:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:804:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:804:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:804:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:805:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:805:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:805:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:808:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw1 @@ got unsigned int @@
drivers/usb/isp1760/isp1760-hcd.c:808:18: sparse: expected restricted __dw [usertype] dw1
drivers/usb/isp1760/isp1760-hcd.c:808:18: sparse: got unsigned int
drivers/usb/isp1760/isp1760-hcd.c:809:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:809:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:809:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:810:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:810:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:810:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:813:26: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:813:26: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:813:26: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:815:26: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:815:26: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:815:26: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:820:26: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:820:26: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:820:26: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:822:34: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:822:34: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:822:34: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:824:26: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:824:26: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:824:26: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:825:26: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:825:26: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:825:26: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:830:34: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:830:34: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:830:34: sparse: right side has type int
drivers/usb/isp1760/isp1760-hcd.c:835:26: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:835:26: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:835:26: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:838:34: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:838:34: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:838:34: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:842:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:842:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:842:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:843:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:843:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:843:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:846:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:846:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:846:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:847:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:847:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:847:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:850:34: sparse: sparse: invalid assignment: &=
drivers/usb/isp1760/isp1760-hcd.c:850:34: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:850:34: sparse: right side has type int
drivers/usb/isp1760/isp1760-hcd.c:852:34: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:852:34: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:852:34: sparse: right side has type int
drivers/usb/isp1760/isp1760-hcd.c:855:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:855:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:855:18: sparse: right side has type int
drivers/usb/isp1760/isp1760-hcd.c:857:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:857:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:857:18: sparse: right side has type int
drivers/usb/isp1760/isp1760-hcd.c:902:26: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw5 @@ got int @@
drivers/usb/isp1760/isp1760-hcd.c:902:26: sparse: expected restricted __dw [usertype] dw5
drivers/usb/isp1760/isp1760-hcd.c:902:26: sparse: got int
drivers/usb/isp1760/isp1760-hcd.c:908:18: sparse: sparse: invalid assignment: |=
drivers/usb/isp1760/isp1760-hcd.c:908:18: sparse: left side has type restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:908:18: sparse: right side has type unsigned int
drivers/usb/isp1760/isp1760-hcd.c:909:18: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __dw [usertype] dw4 @@ got unsigned int [assigned] [usertype] usof @@
drivers/usb/isp1760/isp1760-hcd.c:909:18: sparse: expected restricted __dw [usertype] dw4
drivers/usb/isp1760/isp1760-hcd.c:909:18: sparse: got unsigned int [assigned] [usertype] usof
drivers/usb/isp1760/isp1760-hcd.c:1241:13: sparse: sparse: bad assignment (>>=) to restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:1246:16: sparse: sparse: restricted __dw degrades to integer
drivers/usb/isp1760/isp1760-hcd.c:1251:33: sparse: sparse: restricted __dw degrades to integer
drivers/usb/isp1760/isp1760-hcd.c:1272:29: sparse: sparse: bad assignment (>>=) to restricted __dw
drivers/usb/isp1760/isp1760-hcd.c:1285:16: sparse: sparse: restricted __dw degrades to integer
drivers/usb/isp1760/isp1760-hcd.c:1286:24: sparse: sparse: restricted __dw degrades to integer
drivers/usb/isp1760/isp1760-hcd.c:1288:26: sparse: sparse: restricted __dw degrades to integer
drivers/usb/isp1760/isp1760-hcd.c:1303:17: sparse: sparse: restricted __dw degrades to integer
drivers/usb/isp1760/isp1760-hcd.c:1303:47: sparse: sparse: restricted __dw degrades to integer
drivers/usb/isp1760/isp1760-hcd.c:1309:14: sparse: sparse: restricted __dw degrades to integer
drivers/usb/isp1760/isp1760-hcd.c:1309:49: sparse: sparse: restricted __dw degrades to integer
vim +487 drivers/usb/isp1760/isp1760-hcd.c
478
479 static void isp1763_ptd_read(struct usb_hcd *hcd, u32 ptd_offset, u32 slot,
480 struct ptd *ptd)
481 {
482 u16 src_offset = ptd_offset + slot * sizeof(*ptd);
483 struct ptd le32_ptd;
484
485 isp1763_mem_read(hcd, src_offset, (u16 *)&le32_ptd, sizeof(le32_ptd));
486 /* Normalize the data obtained */
> 487 ptd->dw0 = le32_to_cpu(le32_ptd.dw0);
> 488 ptd->dw1 = le32_to_cpu(le32_ptd.dw1);
> 489 ptd->dw2 = le32_to_cpu(le32_ptd.dw2);
> 490 ptd->dw3 = le32_to_cpu(le32_ptd.dw3);
> 491 ptd->dw4 = le32_to_cpu(le32_ptd.dw4);
> 492 ptd->dw5 = le32_to_cpu(le32_ptd.dw5);
> 493 ptd->dw6 = le32_to_cpu(le32_ptd.dw6);
> 494 ptd->dw7 = le32_to_cpu(le32_ptd.dw7);
495 }
496
497 static void ptd_read(struct usb_hcd *hcd, u32 ptd_offset, u32 slot,
498 struct ptd *ptd)
499 {
500 struct isp1760_hcd *priv = hcd_to_priv(hcd);
501
502 if (!priv->is_isp1763)
503 return isp1760_ptd_read(hcd, ptd_offset, slot, ptd);
504
505 isp1763_ptd_read(hcd, ptd_offset, slot, ptd);
506 }
507
508 static void isp1763_ptd_write(struct usb_hcd *hcd, u32 ptd_offset, u32 slot,
509 struct ptd *cpu_ptd)
510 {
511 u16 dst_offset = ptd_offset + slot * sizeof(*cpu_ptd);
512 struct ptd ptd;
513
> 514 ptd.dw0 = cpu_to_le32(cpu_ptd->dw0);
> 515 ptd.dw1 = cpu_to_le32(cpu_ptd->dw1);
> 516 ptd.dw2 = cpu_to_le32(cpu_ptd->dw2);
> 517 ptd.dw3 = cpu_to_le32(cpu_ptd->dw3);
> 518 ptd.dw4 = cpu_to_le32(cpu_ptd->dw4);
> 519 ptd.dw5 = cpu_to_le32(cpu_ptd->dw5);
> 520 ptd.dw6 = cpu_to_le32(cpu_ptd->dw6);
> 521 ptd.dw7 = cpu_to_le32(cpu_ptd->dw7);
522
523 isp1763_mem_write(hcd, dst_offset, (u16 *)&ptd.dw0,
524 8 * sizeof(ptd.dw0));
525 }
526
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 39213 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 6/7] dt-bindings: usb: nxp,isp1760: add bindings
2021-05-04 10:19 [PATCH 0/7] usb: isp1760: extend support for isp1763 Rui Miguel Silva
` (4 preceding siblings ...)
2021-05-04 10:19 ` [PATCH 5/7] usb: isp1760: add support for isp1763 Rui Miguel Silva
@ 2021-05-04 10:19 ` Rui Miguel Silva
2021-05-04 13:55 ` Rob Herring
2021-05-04 10:19 ` [PATCH 7/7] usb: isp1763: add peripheral mode Rui Miguel Silva
2021-05-06 10:50 ` [PATCH 0/7] usb: isp1760: extend support for isp1763 Greg Kroah-Hartman
7 siblings, 1 reply; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-04 10:19 UTC (permalink / raw)
To: Greg Kroah-Hartman, Sebastian Siewior, Laurent Pinchart, Rob Herring
Cc: linux-usb, devicetree, Rui Miguel Silva
The nxp,isp1760 driver is old in the tree, but did not had a bindings
entry, since I am extend it to support isp1763 in the same family, use
this to add a proper yaml bindings file.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
.../devicetree/bindings/usb/nxp,isp1760.yaml | 59 +++++++++++++++++++
1 file changed, 59 insertions(+)
create mode 100644 Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
diff --git a/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml b/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
new file mode 100644
index 000000000000..f1084b64da5e
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
@@ -0,0 +1,59 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/usb/nxp,isp1760.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NXP ISP1760 family controller bindings
+
+maintainers:
+ - Sebastian Siewior <bigeasy@linuxtronix.de>
+ - Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+
+description: |
+ NXP ISP1760 family, which includes ISP1760/1761/1763 devicetree controller
+ bindings
+
+properties:
+ compatible:
+ enum:
+ - nxp,isp1760
+ - nxp,isp1761
+ - nxp,isp1763
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ bus-width:
+ description:
+ Number of data lines.
+ enum: [8, 16, 32]
+ default: 32
+
+ dr_mode:
+ enum:
+ - host
+ - peripheral
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+additionalProperties: true
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ usb: usb@40200000 {
+ compatible = "nxp,usb-isp1763";
+ reg = <0x040200000 0x100000>;
+ interrupts-parent = <&gic>;
+ interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+ bus-width = <16>;
+ dr_mode = "host";
+ };
+
+...
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 6/7] dt-bindings: usb: nxp,isp1760: add bindings
2021-05-04 10:19 ` [PATCH 6/7] dt-bindings: usb: nxp,isp1760: add bindings Rui Miguel Silva
@ 2021-05-04 13:55 ` Rob Herring
0 siblings, 0 replies; 25+ messages in thread
From: Rob Herring @ 2021-05-04 13:55 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: devicetree, Greg Kroah-Hartman, Sebastian Siewior, Rob Herring,
linux-usb, Laurent Pinchart
On Tue, 04 May 2021 11:19:09 +0100, Rui Miguel Silva wrote:
> The nxp,isp1760 driver is old in the tree, but did not had a bindings
> entry, since I am extend it to support isp1763 in the same family, use
> this to add a proper yaml bindings file.
>
> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
> ---
> .../devicetree/bindings/usb/nxp,isp1760.yaml | 59 +++++++++++++++++++
> 1 file changed, 59 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
Documentation/devicetree/bindings/usb/nxp,isp1760.example.dt.yaml:0:0: /example-0/usb@40200000: failed to match any schema with compatible: ['nxp,usb-isp1763']
See https://patchwork.ozlabs.org/patch/1473757
This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit.
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 7/7] usb: isp1763: add peripheral mode
2021-05-04 10:19 [PATCH 0/7] usb: isp1760: extend support for isp1763 Rui Miguel Silva
` (5 preceding siblings ...)
2021-05-04 10:19 ` [PATCH 6/7] dt-bindings: usb: nxp,isp1760: add bindings Rui Miguel Silva
@ 2021-05-04 10:19 ` Rui Miguel Silva
2021-05-06 10:50 ` [PATCH 0/7] usb: isp1760: extend support for isp1763 Greg Kroah-Hartman
7 siblings, 0 replies; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-04 10:19 UTC (permalink / raw)
To: Greg Kroah-Hartman, Sebastian Siewior, Laurent Pinchart, Rob Herring
Cc: linux-usb, devicetree, Rui Miguel Silva
Besides the already host mode support add peripheral mode support for
the isp1763 IP from the isp1760 family.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/usb/isp1760/isp1760-core.c | 34 +++++++++---
drivers/usb/isp1760/isp1760-regs.h | 87 ++++++++++++++++++++++++++++++
drivers/usb/isp1760/isp1760-udc.c | 3 +-
3 files changed, 115 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/isp1760/isp1760-core.c b/drivers/usb/isp1760/isp1760-core.c
index 31de1064aa23..f9f77099b8ae 100644
--- a/drivers/usb/isp1760/isp1760-core.c
+++ b/drivers/usb/isp1760/isp1760-core.c
@@ -82,7 +82,8 @@ static int isp1760_init_core(struct isp1760_device *isp)
*
* TODO: Really support OTG. For now we configure port 1 in device mode
*/
- if ((isp->devflags & ISP1760_FLAG_ISP1761) &&
+ if (((isp->devflags & ISP1760_FLAG_ISP1761) ||
+ (isp->devflags & ISP1760_FLAG_ISP1763)) &&
(isp->devflags & ISP1760_FLAG_PERIPHERAL_EN)) {
isp1760_field_set(hcd->fields, HW_DM_PULLDOWN);
isp1760_field_set(hcd->fields, HW_DP_PULLDOWN);
@@ -185,16 +186,28 @@ static struct regmap_config isp1761_dc_regmap_conf = {
.volatile_table = &isp176x_dc_volatile_table,
};
+static struct regmap_config isp1763_dc_regmap_conf = {
+ .name = "isp1763-dc",
+ .reg_bits = 8,
+ .reg_stride = 4,
+ .val_bits = 16,
+ .fast_io = true,
+ .max_register = ISP176x_DC_TESTMODE,
+ .volatile_table = &isp176x_dc_volatile_table,
+};
+
int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
struct device *dev, unsigned int devflags)
{
- bool udc_disabled = !(devflags & ISP1760_FLAG_ISP1761);
const struct regmap_config *hc_regmap;
const struct reg_field *hc_reg_fields;
+ const struct regmap_config *dc_regmap;
+ const struct reg_field *dc_reg_fields;
struct isp1760_device *isp;
struct isp1760_hcd *hcd;
struct isp1760_udc *udc;
struct regmap_field *f;
+ bool udc_enabled;
int ret;
int i;
@@ -202,8 +215,11 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
* If neither the HCD not the UDC is enabled return an error, as no
* device would be registered.
*/
+ udc_enabled = ((devflags & ISP1760_FLAG_ISP1763) ||
+ (devflags & ISP1760_FLAG_ISP1761));
+
if ((!IS_ENABLED(CONFIG_USB_ISP1760_HCD) || usb_disabled()) &&
- (!IS_ENABLED(CONFIG_USB_ISP1761_UDC) || udc_disabled))
+ (!IS_ENABLED(CONFIG_USB_ISP1761_UDC) || !udc_enabled))
return -ENODEV;
isp = devm_kzalloc(dev, sizeof(*isp), GFP_KERNEL);
@@ -233,9 +249,13 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
if (hcd->is_isp1763) {
hc_regmap = &isp1763_hc_regmap_conf;
hc_reg_fields = &isp1763_hc_reg_fields[0];
+ dc_regmap = &isp1763_dc_regmap_conf;
+ dc_reg_fields = &isp1763_dc_reg_fields[0];
} else {
hc_regmap = &isp1760_hc_regmap_conf;
hc_reg_fields = &isp1760_hc_reg_fields[0];
+ dc_regmap = &isp1761_dc_regmap_conf;
+ dc_reg_fields = &isp1761_dc_reg_fields[0];
}
isp->rst_gpio = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);
@@ -258,14 +278,12 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
hcd->fields[i] = f;
}
- udc->regs = devm_regmap_init_mmio(dev, hcd->base,
- &isp1761_dc_regmap_conf);
+ udc->regs = devm_regmap_init_mmio(dev, hcd->base, dc_regmap);
if (IS_ERR(udc->regs))
return PTR_ERR(udc->regs);
for (i = 0; i < DC_FIELD_MAX; i++) {
- f = devm_regmap_field_alloc(dev, udc->regs,
- isp1761_dc_reg_fields[i]);
+ f = devm_regmap_field_alloc(dev, udc->regs, dc_reg_fields[i]);
if (IS_ERR(f))
return PTR_ERR(f);
@@ -288,7 +306,7 @@ int isp1760_register(struct resource *mem, int irq, unsigned long irqflags,
return ret;
}
- if (IS_ENABLED(CONFIG_USB_ISP1761_UDC) && !udc_disabled) {
+ if (IS_ENABLED(CONFIG_USB_ISP1761_UDC) && udc_enabled) {
ret = isp1760_udc_register(isp, irq, irqflags);
if (ret < 0) {
isp1760_hcd_unregister(hcd);
diff --git a/drivers/usb/isp1760/isp1760-regs.h b/drivers/usb/isp1760/isp1760-regs.h
index c98466f66cb6..a66f77edb814 100644
--- a/drivers/usb/isp1760/isp1760-regs.h
+++ b/drivers/usb/isp1760/isp1760-regs.h
@@ -465,4 +465,91 @@ static const struct reg_field isp1761_dc_reg_fields[] = {
[DC_FRAMENUM] = REG_FIELD(ISP176x_DC_FRAMENUM, 0, 10),
};
+/* ISP1763 */
+/* Initialization Registers */
+#define ISP1763_DC_ADDRESS 0x00
+#define ISP1763_DC_MODE 0x0c
+#define ISP1763_DC_INTCONF 0x10
+#define ISP1763_DC_INTENABLE 0x14
+
+/* Data Flow Registers */
+#define ISP1763_DC_EPMAXPKTSZ 0x04
+#define ISP1763_DC_EPTYPE 0x08
+
+#define ISP1763_DC_BUFLEN 0x1c
+#define ISP1763_DC_BUFSTAT 0x1e
+#define ISP1763_DC_DATAPORT 0x20
+
+#define ISP1763_DC_CTRLFUNC 0x28
+#define ISP1763_DC_EPINDEX 0x2c
+
+/* DMA Registers */
+#define ISP1763_DC_DMACMD 0x30
+#define ISP1763_DC_DMATXCOUNT 0x34
+#define ISP1763_DC_DMACONF 0x38
+#define ISP1763_DC_DMAHW 0x3c
+#define ISP1763_DC_DMAINTREASON 0x50
+#define ISP1763_DC_DMAINTEN 0x54
+#define ISP1763_DC_DMAEP 0x58
+#define ISP1763_DC_DMABURSTCOUNT 0x64
+
+/* General Registers */
+#define ISP1763_DC_INTERRUPT 0x18
+#define ISP1763_DC_CHIPID 0x70
+#define ISP1763_DC_FRAMENUM 0x74
+#define ISP1763_DC_SCRATCH 0x78
+#define ISP1763_DC_UNLOCKDEV 0x7c
+#define ISP1763_DC_INTPULSEWIDTH 0x80
+#define ISP1763_DC_TESTMODE 0x84
+
+static const struct regmap_range isp1763_dc_volatile_ranges[] = {
+ regmap_reg_range(ISP1763_DC_EPMAXPKTSZ, ISP1763_DC_EPTYPE),
+ regmap_reg_range(ISP1763_DC_BUFLEN, ISP1763_DC_EPINDEX),
+};
+
+static const struct regmap_access_table isp1763_dc_volatile_table = {
+ .yes_ranges = isp1763_dc_volatile_ranges,
+ .n_yes_ranges = ARRAY_SIZE(isp1763_dc_volatile_ranges),
+};
+
+static const struct reg_field isp1763_dc_reg_fields[] = {
+ [DC_DEVEN] = REG_FIELD(ISP1763_DC_ADDRESS, 7, 7),
+ [DC_DEVADDR] = REG_FIELD(ISP1763_DC_ADDRESS, 0, 6),
+ [DC_VBUSSTAT] = REG_FIELD(ISP1763_DC_MODE, 8, 8),
+ [DC_SFRESET] = REG_FIELD(ISP1763_DC_MODE, 4, 4),
+ [DC_GLINTENA] = REG_FIELD(ISP1763_DC_MODE, 3, 3),
+ [DC_CDBGMOD_ACK] = REG_FIELD(ISP1763_DC_INTCONF, 6, 6),
+ [DC_DDBGMODIN_ACK] = REG_FIELD(ISP1763_DC_INTCONF, 4, 4),
+ [DC_DDBGMODOUT_ACK] = REG_FIELD(ISP1763_DC_INTCONF, 2, 2),
+ [DC_INTPOL] = REG_FIELD(ISP1763_DC_INTCONF, 0, 0),
+ [DC_IEPRXTX_7] = REG_FIELD(ISP1763_DC_INTENABLE, 25, 25),
+ [DC_IEPRXTX_6] = REG_FIELD(ISP1763_DC_INTENABLE, 23, 23),
+ [DC_IEPRXTX_5] = REG_FIELD(ISP1763_DC_INTENABLE, 21, 21),
+ [DC_IEPRXTX_4] = REG_FIELD(ISP1763_DC_INTENABLE, 19, 19),
+ [DC_IEPRXTX_3] = REG_FIELD(ISP1763_DC_INTENABLE, 17, 17),
+ [DC_IEPRXTX_2] = REG_FIELD(ISP1763_DC_INTENABLE, 15, 15),
+ [DC_IEPRXTX_1] = REG_FIELD(ISP1763_DC_INTENABLE, 13, 13),
+ [DC_IEPRXTX_0] = REG_FIELD(ISP1763_DC_INTENABLE, 11, 11),
+ [DC_IEP0SETUP] = REG_FIELD(ISP1763_DC_INTENABLE, 8, 8),
+ [DC_IEVBUS] = REG_FIELD(ISP1763_DC_INTENABLE, 7, 7),
+ [DC_IEHS_STA] = REG_FIELD(ISP1763_DC_INTENABLE, 5, 5),
+ [DC_IERESM] = REG_FIELD(ISP1763_DC_INTENABLE, 4, 4),
+ [DC_IESUSP] = REG_FIELD(ISP1763_DC_INTENABLE, 3, 3),
+ [DC_IEBRST] = REG_FIELD(ISP1763_DC_INTENABLE, 0, 0),
+ [DC_EP0SETUP] = REG_FIELD(ISP1763_DC_EPINDEX, 5, 5),
+ [DC_ENDPIDX] = REG_FIELD(ISP1763_DC_EPINDEX, 1, 4),
+ [DC_EPDIR] = REG_FIELD(ISP1763_DC_EPINDEX, 0, 0),
+ [DC_CLBUF] = REG_FIELD(ISP1763_DC_CTRLFUNC, 4, 4),
+ [DC_VENDP] = REG_FIELD(ISP1763_DC_CTRLFUNC, 3, 3),
+ [DC_DSEN] = REG_FIELD(ISP1763_DC_CTRLFUNC, 2, 2),
+ [DC_STATUS] = REG_FIELD(ISP1763_DC_CTRLFUNC, 1, 1),
+ [DC_STALL] = REG_FIELD(ISP1763_DC_CTRLFUNC, 0, 0),
+ [DC_BUFLEN] = REG_FIELD(ISP1763_DC_BUFLEN, 0, 15),
+ [DC_FFOSZ] = REG_FIELD(ISP1763_DC_EPMAXPKTSZ, 0, 10),
+ [DC_EPENABLE] = REG_FIELD(ISP1763_DC_EPTYPE, 3, 3),
+ [DC_ENDPTYP] = REG_FIELD(ISP1763_DC_EPTYPE, 0, 1),
+ [DC_UFRAMENUM] = REG_FIELD(ISP1763_DC_FRAMENUM, 11, 13),
+ [DC_FRAMENUM] = REG_FIELD(ISP1763_DC_FRAMENUM, 0, 10),
+};
+
#endif
diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
index 980d51bff65e..1eff029c4158 100644
--- a/drivers/usb/isp1760/isp1760-udc.c
+++ b/drivers/usb/isp1760/isp1760-udc.c
@@ -1503,7 +1503,8 @@ static int isp1760_udc_init(struct isp1760_udc *udc)
return -ENODEV;
}
- if (chipid != 0x00011582 && chipid != 0x00158210) {
+ if (chipid != 0x00011582 && chipid != 0x00158210 &&
+ chipid != 0x00006320) {
dev_err(udc->isp->dev, "udc: invalid chip ID 0x%08x\n", chipid);
return -ENODEV;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 0/7] usb: isp1760: extend support for isp1763
2021-05-04 10:19 [PATCH 0/7] usb: isp1760: extend support for isp1763 Rui Miguel Silva
` (6 preceding siblings ...)
2021-05-04 10:19 ` [PATCH 7/7] usb: isp1763: add peripheral mode Rui Miguel Silva
@ 2021-05-06 10:50 ` Greg Kroah-Hartman
2021-05-06 12:25 ` Laurent Pinchart
2021-05-06 13:29 ` Rui Miguel Silva
7 siblings, 2 replies; 25+ messages in thread
From: Greg Kroah-Hartman @ 2021-05-06 10:50 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: Sebastian Siewior, Laurent Pinchart, Rob Herring, linux-usb, devicetree
On Tue, May 04, 2021 at 11:19:03AM +0100, Rui Miguel Silva wrote:
> The Arm MPS3 FPGA prototyping board [0] have an isp1763 [1] as USB controller.
> There is already support for the isp1760 and isp1761 in tree, this series extend
> the support also for the isp1763.
>
> Move register access using regmap, remove some platform data and code, refactor
> the mempool, use dr_mode to align to existing bindings, then add the support for
> isp1763 host mode, add bindings files that did not existed and at the end
> add also support for peripheral mode for isp1763.
>
> @Laurent and @Sebastian, I add both of you in the bindings files as maintainers
> (it is a mandatory field)since you were the ones which contributed with the
> initial code and peripheral code, let me know if you are ok with it.
> If yes I may send a follow up to add also entries in MAINTAINERS file that it is
> also missing.
First 3 patches now applied, feel free to rebase and resend the rest
based on the review comments.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 0/7] usb: isp1760: extend support for isp1763
2021-05-06 10:50 ` [PATCH 0/7] usb: isp1760: extend support for isp1763 Greg Kroah-Hartman
@ 2021-05-06 12:25 ` Laurent Pinchart
2021-05-06 13:41 ` Rui Miguel Silva
2021-05-06 13:29 ` Rui Miguel Silva
1 sibling, 1 reply; 25+ messages in thread
From: Laurent Pinchart @ 2021-05-06 12:25 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Rui Miguel Silva, Sebastian Siewior, Rob Herring, linux-usb, devicetree
Hi Greg,
On Thu, May 06, 2021 at 12:50:05PM +0200, Greg Kroah-Hartman wrote:
> On Tue, May 04, 2021 at 11:19:03AM +0100, Rui Miguel Silva wrote:
> > The Arm MPS3 FPGA prototyping board [0] have an isp1763 [1] as USB controller.
> > There is already support for the isp1760 and isp1761 in tree, this series extend
> > the support also for the isp1763.
> >
> > Move register access using regmap, remove some platform data and code, refactor
> > the mempool, use dr_mode to align to existing bindings, then add the support for
> > isp1763 host mode, add bindings files that did not existed and at the end
> > add also support for peripheral mode for isp1763.
> >
> > @Laurent and @Sebastian, I add both of you in the bindings files as maintainers
> > (it is a mandatory field)since you were the ones which contributed with the
> > initial code and peripheral code, let me know if you are ok with it.
> > If yes I may send a follow up to add also entries in MAINTAINERS file that it is
> > also missing.
>
> First 3 patches now applied, feel free to rebase and resend the rest
> based on the review comments.
That's a bit fast, I've just review 1/7.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 0/7] usb: isp1760: extend support for isp1763
2021-05-06 12:25 ` Laurent Pinchart
@ 2021-05-06 13:41 ` Rui Miguel Silva
2021-05-06 14:02 ` Greg Kroah-Hartman
0 siblings, 1 reply; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-06 13:41 UTC (permalink / raw)
To: Laurent Pinchart, Greg Kroah-Hartman
Cc: Sebastian Siewior, Rob Herring, linux-usb, devicetree
Hi Greg,
On Thu May 6, 2021 at 1:25 PM WEST, Laurent Pinchart wrote:
> Hi Greg,
>
> On Thu, May 06, 2021 at 12:50:05PM +0200, Greg Kroah-Hartman wrote:
> > On Tue, May 04, 2021 at 11:19:03AM +0100, Rui Miguel Silva wrote:
> > > The Arm MPS3 FPGA prototyping board [0] have an isp1763 [1] as USB controller.
> > > There is already support for the isp1760 and isp1761 in tree, this series extend
> > > the support also for the isp1763.
> > >
> > > Move register access using regmap, remove some platform data and code, refactor
> > > the mempool, use dr_mode to align to existing bindings, then add the support for
> > > isp1763 host mode, add bindings files that did not existed and at the end
> > > add also support for peripheral mode for isp1763.
> > >
> > > @Laurent and @Sebastian, I add both of you in the bindings files as maintainers
> > > (it is a mandatory field)since you were the ones which contributed with the
> > > initial code and peripheral code, let me know if you are ok with it.
> > > If yes I may send a follow up to add also entries in MAINTAINERS file that it is
> > > also missing.
> >
> > First 3 patches now applied, feel free to rebase and resend the rest
> > based on the review comments.
>
> That's a bit fast, I've just review 1/7.
Let me know if you will drop the patches from your queue, or do you
want me to send some follow up, since Laurent comments are not very
large?
------
Cheers,
Rui
>
> --
> Regards,
>
> Laurent Pinchart
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 0/7] usb: isp1760: extend support for isp1763
2021-05-06 13:41 ` Rui Miguel Silva
@ 2021-05-06 14:02 ` Greg Kroah-Hartman
2021-05-06 14:15 ` Rui Miguel Silva
0 siblings, 1 reply; 25+ messages in thread
From: Greg Kroah-Hartman @ 2021-05-06 14:02 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: Laurent Pinchart, Sebastian Siewior, Rob Herring, linux-usb, devicetree
On Thu, May 06, 2021 at 02:41:14PM +0100, Rui Miguel Silva wrote:
> Hi Greg,
> On Thu May 6, 2021 at 1:25 PM WEST, Laurent Pinchart wrote:
> > Hi Greg,
> >
> > On Thu, May 06, 2021 at 12:50:05PM +0200, Greg Kroah-Hartman wrote:
> > > On Tue, May 04, 2021 at 11:19:03AM +0100, Rui Miguel Silva wrote:
> > > > The Arm MPS3 FPGA prototyping board [0] have an isp1763 [1] as USB controller.
> > > > There is already support for the isp1760 and isp1761 in tree, this series extend
> > > > the support also for the isp1763.
> > > >
> > > > Move register access using regmap, remove some platform data and code, refactor
> > > > the mempool, use dr_mode to align to existing bindings, then add the support for
> > > > isp1763 host mode, add bindings files that did not existed and at the end
> > > > add also support for peripheral mode for isp1763.
> > > >
> > > > @Laurent and @Sebastian, I add both of you in the bindings files as maintainers
> > > > (it is a mandatory field)since you were the ones which contributed with the
> > > > initial code and peripheral code, let me know if you are ok with it.
> > > > If yes I may send a follow up to add also entries in MAINTAINERS file that it is
> > > > also missing.
> > >
> > > First 3 patches now applied, feel free to rebase and resend the rest
> > > based on the review comments.
> >
> > That's a bit fast, I've just review 1/7.
>
> Let me know if you will drop the patches from your queue, or do you
> want me to send some follow up, since Laurent comments are not very
> large?
Follow-up is fine :)
thanks,
greg k-h
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 0/7] usb: isp1760: extend support for isp1763
2021-05-06 14:02 ` Greg Kroah-Hartman
@ 2021-05-06 14:15 ` Rui Miguel Silva
0 siblings, 0 replies; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-06 14:15 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Laurent Pinchart, Sebastian Siewior, Rob Herring, linux-usb, devicetree
On Thu May 6, 2021 at 3:02 PM WEST, Greg Kroah-Hartman wrote:
> On Thu, May 06, 2021 at 02:41:14PM +0100, Rui Miguel Silva wrote:
> > Hi Greg,
> > On Thu May 6, 2021 at 1:25 PM WEST, Laurent Pinchart wrote:
> > > Hi Greg,
> > >
> > > On Thu, May 06, 2021 at 12:50:05PM +0200, Greg Kroah-Hartman wrote:
> > > > On Tue, May 04, 2021 at 11:19:03AM +0100, Rui Miguel Silva wrote:
> > > > > The Arm MPS3 FPGA prototyping board [0] have an isp1763 [1] as USB controller.
> > > > > There is already support for the isp1760 and isp1761 in tree, this series extend
> > > > > the support also for the isp1763.
> > > > >
> > > > > Move register access using regmap, remove some platform data and code, refactor
> > > > > the mempool, use dr_mode to align to existing bindings, then add the support for
> > > > > isp1763 host mode, add bindings files that did not existed and at the end
> > > > > add also support for peripheral mode for isp1763.
> > > > >
> > > > > @Laurent and @Sebastian, I add both of you in the bindings files as maintainers
> > > > > (it is a mandatory field)since you were the ones which contributed with the
> > > > > initial code and peripheral code, let me know if you are ok with it.
> > > > > If yes I may send a follow up to add also entries in MAINTAINERS file that it is
> > > > > also missing.
> > > >
> > > > First 3 patches now applied, feel free to rebase and resend the rest
> > > > based on the review comments.
> > >
> > > That's a bit fast, I've just review 1/7.
> >
> > Let me know if you will drop the patches from your queue, or do you
> > want me to send some follow up, since Laurent comments are not very
> > large?
>
> Follow-up is fine :)
Will do, thanks.
------
Cheers,
Rui
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 0/7] usb: isp1760: extend support for isp1763
2021-05-06 10:50 ` [PATCH 0/7] usb: isp1760: extend support for isp1763 Greg Kroah-Hartman
2021-05-06 12:25 ` Laurent Pinchart
@ 2021-05-06 13:29 ` Rui Miguel Silva
2021-05-06 13:38 ` Laurent Pinchart
1 sibling, 1 reply; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-06 13:29 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Sebastian Siewior, Laurent Pinchart, Rob Herring, linux-usb, devicetree
Hi Greg,
On Thu May 6, 2021 at 11:50 AM WEST, Greg Kroah-Hartman wrote:
> On Tue, May 04, 2021 at 11:19:03AM +0100, Rui Miguel Silva wrote:
> > The Arm MPS3 FPGA prototyping board [0] have an isp1763 [1] as USB controller.
> > There is already support for the isp1760 and isp1761 in tree, this series extend
> > the support also for the isp1763.
> >
> > Move register access using regmap, remove some platform data and code, refactor
> > the mempool, use dr_mode to align to existing bindings, then add the support for
> > isp1763 host mode, add bindings files that did not existed and at the end
> > add also support for peripheral mode for isp1763.
> >
> > @Laurent and @Sebastian, I add both of you in the bindings files as maintainers
> > (it is a mandatory field)since you were the ones which contributed with the
> > initial code and peripheral code, let me know if you are ok with it.
> > If yes I may send a follow up to add also entries in MAINTAINERS file that it is
> > also missing.
>
> First 3 patches now applied, feel free to rebase and resend the rest
> based on the review comments.
Thanks, yeah, I was taking the chance to clean all the pre-existing
sparse warnings in that driver, since this was triggering some new
ones.
And I knew that you merging this first ones would make Laurent jump
from his chair and review this, eheh. Thanks for that also.
I will rebase and send follow up series that will address all
that sparse warnings.
------
Cheers,
Rui
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 0/7] usb: isp1760: extend support for isp1763
2021-05-06 13:29 ` Rui Miguel Silva
@ 2021-05-06 13:38 ` Laurent Pinchart
2021-05-06 13:53 ` Rui Miguel Silva
0 siblings, 1 reply; 25+ messages in thread
From: Laurent Pinchart @ 2021-05-06 13:38 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: Greg Kroah-Hartman, Sebastian Siewior, Rob Herring, linux-usb,
devicetree
On Thu, May 06, 2021 at 02:29:14PM +0100, Rui Miguel Silva wrote:
> On Thu May 6, 2021 at 11:50 AM WEST, Greg Kroah-Hartman wrote:
> > On Tue, May 04, 2021 at 11:19:03AM +0100, Rui Miguel Silva wrote:
> > > The Arm MPS3 FPGA prototyping board [0] have an isp1763 [1] as USB controller.
> > > There is already support for the isp1760 and isp1761 in tree, this series extend
> > > the support also for the isp1763.
> > >
> > > Move register access using regmap, remove some platform data and code, refactor
> > > the mempool, use dr_mode to align to existing bindings, then add the support for
> > > isp1763 host mode, add bindings files that did not existed and at the end
> > > add also support for peripheral mode for isp1763.
> > >
> > > @Laurent and @Sebastian, I add both of you in the bindings files as maintainers
> > > (it is a mandatory field)since you were the ones which contributed with the
> > > initial code and peripheral code, let me know if you are ok with it.
> > > If yes I may send a follow up to add also entries in MAINTAINERS file that it is
> > > also missing.
> >
> > First 3 patches now applied, feel free to rebase and resend the rest
> > based on the review comments.
>
> Thanks, yeah, I was taking the chance to clean all the pre-existing
> sparse warnings in that driver, since this was triggering some new
> ones.
>
> And I knew that you merging this first ones would make Laurent jump
> from his chair and review this, eheh. Thanks for that also.
You've planned it together, haven't you, you naughty scoundrels :-D
> I will rebase and send follow up series that will address all
> that sparse warnings.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 0/7] usb: isp1760: extend support for isp1763
2021-05-06 13:38 ` Laurent Pinchart
@ 2021-05-06 13:53 ` Rui Miguel Silva
0 siblings, 0 replies; 25+ messages in thread
From: Rui Miguel Silva @ 2021-05-06 13:53 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Greg Kroah-Hartman, Sebastian Siewior, Rob Herring, linux-usb,
devicetree
On Thu May 6, 2021 at 2:38 PM WEST, Laurent Pinchart wrote:
> On Thu, May 06, 2021 at 02:29:14PM +0100, Rui Miguel Silva wrote:
> > On Thu May 6, 2021 at 11:50 AM WEST, Greg Kroah-Hartman wrote:
> > > On Tue, May 04, 2021 at 11:19:03AM +0100, Rui Miguel Silva wrote:
> > > > The Arm MPS3 FPGA prototyping board [0] have an isp1763 [1] as USB controller.
> > > > There is already support for the isp1760 and isp1761 in tree, this series extend
> > > > the support also for the isp1763.
> > > >
> > > > Move register access using regmap, remove some platform data and code, refactor
> > > > the mempool, use dr_mode to align to existing bindings, then add the support for
> > > > isp1763 host mode, add bindings files that did not existed and at the end
> > > > add also support for peripheral mode for isp1763.
> > > >
> > > > @Laurent and @Sebastian, I add both of you in the bindings files as maintainers
> > > > (it is a mandatory field)since you were the ones which contributed with the
> > > > initial code and peripheral code, let me know if you are ok with it.
> > > > If yes I may send a follow up to add also entries in MAINTAINERS file that it is
> > > > also missing.
> > >
> > > First 3 patches now applied, feel free to rebase and resend the rest
> > > based on the review comments.
> >
> > Thanks, yeah, I was taking the chance to clean all the pre-existing
> > sparse warnings in that driver, since this was triggering some new
> > ones.
> >
> > And I knew that you merging this first ones would make Laurent jump
> > from his chair and review this, eheh. Thanks for that also.
>
> You've planned it together, haven't you, you naughty scoundrels :-D
No, but I wish :)
^ permalink raw reply [flat|nested] 25+ messages in thread