On Tue, Oct 28, 2014 at 03:27:51PM -0700, Andrew Bresticker wrote:
[...]
> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> index c6a66de..0f4cdef 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -163,6 +163,7 @@ config PINCTRL_TEGRA_XUSB
> select GENERIC_PHY
> select PINCONF
> select PINMUX
> + select MAILBOX
I think this should be a "depends on" because we use the mailbox API as
a client rather than a provider.
> diff --git a/drivers/pinctrl/pinctrl-tegra-xusb.c b/drivers/pinctrl/pinctrl-tegra-xusb.c
[...]
> struct tegra_xusb_padctl_function {
> const char *name;
> const char * const *groups;
> @@ -72,6 +222,16 @@ struct tegra_xusb_padctl_soc {
>
> const struct tegra_xusb_padctl_lane *lanes;
> unsigned int num_lanes;
> +
> + u32 rx_wander;
> + u32 rx_eq;
> + u32 cdr_cntl;
> + u32 dfe_cntl;
> + u32 hs_slew;
> + u32 ls_rslew[TEGRA_XUSB_UTMI_PHYS];
> + u32 hs_discon_level;
> + u32 spare_in;
> + int hsic_port_offset;
unsigned int? Are these values all SoC-specific or can they vary per
board?
> +struct tegra_xusb_fuse_calibration {
> + u32 hs_curr_level[TEGRA_XUSB_UTMI_PHYS];
> + u32 hs_iref_cap;
> + u32 hs_term_range_adj;
> + u32 hs_squelch_level;
> +};
> +
> +struct tegra_xusb_usb3_port {
> + int lane;
unsigned
> + bool context_saved;
> + u32 tap1_val;
> + u32 amp_val;
> + u32 ctle_z_val;
> + u32 ctle_g_val;
> +};
> +
[...]
> +static inline bool is_otg_lane(unsigned int lane)
> +{
> + return lane >= TEGRA_XUSB_PADCTL_PIN_OTG_0 &&
> + lane <= TEGRA_XUSB_PADCTL_PIN_OTG_2;
> +}
> +
> +static inline bool is_hsic_lane(unsigned int lane)
> +{
> + return lane >= TEGRA_XUSB_PADCTL_PIN_HSIC_0 &&
> + lane <= TEGRA_XUSB_PADCTL_PIN_HSIC_1;
> +}
> +
> +static inline bool is_pcie_or_sata_lane(unsigned int lane)
> +{
> + return lane >= TEGRA_XUSB_PADCTL_PIN_PCIE_0 &&
> + lane <= TEGRA_XUSB_PADCTL_PIN_SATA_0;
> +}
> +
> +static int lane_to_usb3_port(struct tegra_xusb_padctl *padctl,
> + unsigned int lane)
> +{
> + int i;
unsigned
> +
> + for (i = 0; i < TEGRA_XUSB_USB3_PHYS; i++) {
> + if (padctl->usb3_ports[i].lane == lane)
> + return i;
> + }
> +
> + return -1;
> +}
Why not return a proper error code here that callers can simply
propagate?
Also, for consistency, I'd prefer the is_*_lane() functions to be
renamed to lane_is_*().
> @@ -321,6 +561,7 @@ static int tegra_xusb_padctl_pinconf_group_get(struct pinctrl_dev *pinctrl,
> struct tegra_xusb_padctl *padctl = pinctrl_dev_get_drvdata(pinctrl);
> const struct tegra_xusb_padctl_lane *lane;
> enum tegra_xusb_padctl_param param;
> + int port;
> u32 value;
The variable here were sorted in inverse christmas tree order, so port
should be below value.
> +static int usb3_phy_to_port(struct phy *phy)
> +{
> + struct tegra_xusb_padctl *padctl = phy_get_drvdata(phy);
> + int i;
unsigned
> +
> + for (i = 0; i < TEGRA_XUSB_USB3_PHYS; i++) {
> + if (phy == padctl->phys[TEGRA_XUSB_PADCTL_USB3_P0 + i])
> + break;
You could simply return i here and then BUG_ON unconditionally.
> + }
> + BUG_ON(i == TEGRA_XUSB_USB3_PHYS);
> +
> + return i;
> +}
Actually, thinking about it some more, perhaps making this a WARN_ON()
and returning an error so that we can continue and propagate the error
would be more useful. BUG_ON() will completely hang the kernel with no
way out but rebooting. WARN_ON() will give a hint about something being
wrong and returning an error will allow the kernel to continue to run,
which might be the only way to diagnose and fix the problem, even if it
means that USB 3.0 support will be disabled.
> +static void usb3_phy_save_context(struct tegra_xusb_padctl *padctl, int port)
unsigned for port...
> +{
> + int lane = padctl->usb3_ports[port].lane;
... and lane.
> + u32 value, offset;
> +
> + padctl->usb3_ports[port].context_saved = true;
What's the purpose of saving the context here? This seems to be
triggered by a request from XUSB, but it's then restored when the PHY is
powered on. How does that even happen? Won't the PHY stay powered all
the time? Or shouldn't the context be saved when powering off the PHY?
> +static int utmi_phy_to_port(struct phy *phy)
> +{
> + struct tegra_xusb_padctl *padctl = phy_get_drvdata(phy);
> + int i;
> +
> + for (i = 0; i < TEGRA_XUSB_UTMI_PHYS; i++) {
> + if (phy == padctl->phys[TEGRA_XUSB_PADCTL_UTMI_P0 + i])
> + break;
> + }
> + BUG_ON(i == TEGRA_XUSB_UTMI_PHYS);
> +
> + return i;
> +}
Same comment as before.
> +static int utmi_phy_power_on(struct phy *phy)
> +{
> + struct tegra_xusb_padctl *padctl = phy_get_drvdata(phy);
> + int port = utmi_phy_to_port(phy);
> + int ret;
The driver uses err as the name for variables that store error codes.
I'd like to remain consistent with that.
> +static int hsic_phy_to_port(struct phy *phy)
> +{
> + struct tegra_xusb_padctl *padctl = phy_get_drvdata(phy);
> + int i;
> +
> + for (i = 0; i < TEGRA_XUSB_HSIC_PHYS; i++) {
> + if (phy == padctl->phys[TEGRA_XUSB_PADCTL_HSIC_P0 + i])
> + break;
> + }
> + BUG_ON(i == TEGRA_XUSB_HSIC_PHYS);
> +
> + return i;
> +}
Again, as mentioned before.
> +static int hsic_phy_power_on(struct phy *phy)
> +{
> + struct tegra_xusb_padctl *padctl = phy_get_drvdata(phy);
> + int port = hsic_phy_to_port(phy);
> + int ret;
> + u32 value;
> +
> + ret = regulator_enable(padctl->vddio_hsic);
> + if (ret)
> + return ret;
> +
> + value = padctl_readl(padctl, XUSB_PADCTL_HSIC_PADX_CTL1(port));
> + value &= ~(XUSB_PADCTL_HSIC_PAD_CTL1_RPD_STROBE |
> + XUSB_PADCTL_HSIC_PAD_CTL1_RPU_DATA |
> + XUSB_PADCTL_HSIC_PAD_CTL1_PD_RX |
> + XUSB_PADCTL_HSIC_PAD_CTL1_PD_ZI |
> + XUSB_PADCTL_HSIC_PAD_CTL1_PD_TRX |
> + XUSB_PADCTL_HSIC_PAD_CTL1_PD_TX);
> + value |= XUSB_PADCTL_HSIC_PAD_CTL1_RPD_DATA |
> + XUSB_PADCTL_HSIC_PAD_CTL1_RPU_STROBE;
> + padctl_writel(padctl, value, XUSB_PADCTL_HSIC_PADX_CTL1(port));
> +
> + return 0;
> +}
> +
> +static int hsic_phy_power_off(struct phy *phy)
> +{
> + struct tegra_xusb_padctl *padctl = phy_get_drvdata(phy);
> + int port = hsic_phy_to_port(phy);
> + u32 value;
> +
> + regulator_disable(padctl->vddio_hsic);
It probably doesn't make much of a difference, but the sequence should
be the reverse of the power-on sequence, so regulator_disable() should
be last in this function.
> +static void hsic_phy_set_idle(struct tegra_xusb_padctl *padctl, int port,
> + bool set)
unsigned int for port. Also maybe rename to set to idle, which makes the
code below somewhat easier to read.
> +{
> + u32 value;
> +
> + value = padctl_readl(padctl, XUSB_PADCTL_HSIC_PADX_CTL1(port));
> + if (set)
> + value |= XUSB_PADCTL_HSIC_PAD_CTL1_RPD_DATA |
> + XUSB_PADCTL_HSIC_PAD_CTL1_RPU_STROBE;
> + else
> + value &= ~(XUSB_PADCTL_HSIC_PAD_CTL1_RPD_DATA |
> + XUSB_PADCTL_HSIC_PAD_CTL1_RPU_STROBE);
> + padctl_writel(padctl, value, XUSB_PADCTL_HSIC_PADX_CTL1(port));
> +}
> +
> +static bool is_phy_mbox_message(u32 cmd)
> +{
> + switch (cmd) {
> + case MBOX_CMD_SAVE_DFE_CTLE_CTX:
> + case MBOX_CMD_START_HSIC_IDLE:
> + case MBOX_CMD_STOP_HSIC_IDLE:
> + return true;
> + default:
> + return false;
> + }
> +}
This is oddly placed. It's only called by tegra_xusb_phy_mbox_rx() below
so would be better placed right in front of it.
> +static void tegra_xusb_phy_mbox_work(struct work_struct *work)
> +{
> + struct tegra_xusb_padctl *padctl = container_of(work,
> + struct tegra_xusb_padctl, mbox_req_work);
Maybe wrap this into a static inline function for readability?
> + struct tegra_xusb_mbox_msg *msg = &padctl->mbox_req;
> + struct tegra_xusb_mbox_msg resp;
> + u32 ports;
> + int i;
unsigned. There are other occurrences where unsigned makes more sense,
even if I haven't explicitly mentioned them anymore.
> + resp.cmd = 0;
> + switch (msg->cmd) {
> + case MBOX_CMD_SAVE_DFE_CTLE_CTX:
> + resp.data = msg->data;
> + if (msg->data > TEGRA_XUSB_USB3_PHYS) {
> + resp.cmd = MBOX_CMD_NAK;
> + } else {
> + usb3_phy_save_context(padctl, msg->data);
> + resp.cmd = MBOX_CMD_ACK;
> + }
> + break;
Perhaps let usb3_phy_save_context() determine validity of the parameter
and return an error otherwise (or for any other failure)? Then you can
set the command to ACK or NAK depending on the return value.
> -#define PIN_OTG_0 0
> -#define PIN_OTG_1 1
> -#define PIN_OTG_2 2
> -#define PIN_ULPI_0 3
> -#define PIN_HSIC_0 4
> -#define PIN_HSIC_1 5
> -#define PIN_PCIE_0 6
> -#define PIN_PCIE_1 7
> -#define PIN_PCIE_2 8
> -#define PIN_PCIE_3 9
> -#define PIN_PCIE_4 10
> -#define PIN_SATA_0 11
I really don't think we should export these, unless we can't make it
work otherwise.
> static int tegra_xusb_padctl_probe(struct platform_device *pdev)
> {
> struct tegra_xusb_padctl *padctl;
> const struct of_device_id *match;
> struct resource *res;
> struct phy *phy;
> - int err;
> + int err, i;
>
> padctl = devm_kzalloc(&pdev->dev, sizeof(*padctl), GFP_KERNEL);
> if (!padctl)
> @@ -888,6 +1980,10 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
> if (IS_ERR(padctl->regs))
> return PTR_ERR(padctl->regs);
>
> + err = tegra_xusb_read_fuse_calibration(padctl);
> + if (err < 0)
> + return err;
> +
> padctl->rst = devm_reset_control_get(&pdev->dev, NULL);
> if (IS_ERR(padctl->rst))
> return PTR_ERR(padctl->rst);
> @@ -896,6 +1992,24 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
> if (err < 0)
> return err;
>
> + for (i = 0; i < TEGRA_XUSB_USB3_PHYS; i++) {
> + char prop[sizeof("nvidia,usb3-port-N-lane")];
> + u32 lane;
> +
> + sprintf(prop, "nvidia,usb3-port-%d-lane", i);
Like I mentioned while reviewing the binding changes, I think it'd be
better to reverse this and put a property to set this into the pinmux
nodes for the USB3 related pins, similar to the nvidia,usb2-port
property.
That should allow us to avoid these nasty dynamically generated property
names.
> @@ -936,6 +2098,18 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
> goto unregister;
> }
>
> + INIT_WORK(&padctl->mbox_req_work, tegra_xusb_phy_mbox_work);
> + padctl->mbox_client.dev = &pdev->dev;
> + padctl->mbox_client.tx_block = true;
> + padctl->mbox_client.tx_tout = 0;
> + padctl->mbox_client.rx_callback = tegra_xusb_phy_mbox_rx;
> + padctl->mbox_chan = mbox_request_channel(&padctl->mbox_client, 0);
> + if (IS_ERR(padctl->mbox_chan)) {
> + err = PTR_ERR(padctl->mbox_chan);
> + dev_err(&pdev->dev, "failed to request mailbox: %d\n", err);
> + goto unregister;
> + }
I think this should be done before the registering the PHY provider so
that we don't expose one (even for only a very short time) before we
haven't made sure that it can be used.
Also, this effectively makes the mailbox mandatory, which means that the
above code is going to break on older DTBs. So I think we have no choice
but to make mailbox (and hence XUSB) support optional.
> return 0;
>
> unregister:
> @@ -950,6 +2124,9 @@ static int tegra_xusb_padctl_remove(struct platform_device *pdev)
> struct tegra_xusb_padctl *padctl = platform_get_drvdata(pdev);
> int err;
>
> + cancel_work_sync(&padctl->mbox_req_work);
> + mbox_free_channel(padctl->mbox_chan);
> +
> pinctrl_unregister(padctl->pinctrl);
>
> err = reset_control_assert(padctl->rst);
> diff --git a/include/soc/tegra/xusb.h b/include/soc/tegra/xusb.h
> index cfe211d..149434f 100644
> --- a/include/soc/tegra/xusb.h
> +++ b/include/soc/tegra/xusb.h
> @@ -10,6 +10,13 @@
> #ifndef __SOC_TEGRA_XUSB_H__
> #define __SOC_TEGRA_XUSB_H__
>
> +#define TEGRA_XUSB_USB3_PHYS 2
> +#define TEGRA_XUSB_UTMI_PHYS 3
> +#define TEGRA_XUSB_HSIC_PHYS 2
> +#define TEGRA_XUSB_NUM_USB_PHYS (TEGRA_XUSB_USB3_PHYS + TEGRA_XUSB_UTMI_PHYS + \
> + TEGRA_XUSB_HSIC_PHYS)
> +#define TEGRA_XUSB_NUM_PHYS (TEGRA_XUSB_NUM_USB_PHYS + 2) /* + SATA & PCIe */
These are really XUSB pad controller specific defines, why does anyone
else need to know this?
Thierry
Attachment:
pgpRK3f7vD6Oe.pgp
Description: PGP signature
