* Re: [PATCH] i2c: i2c-mux-pca954x: retry updating the mux selection on failure
From: Wolfram Sang @ 2016-09-15 19:52 UTC (permalink / raw)
To: Peter Rosin; +Cc: open list:I2C MUXES, open list
In-Reply-To: <1473859452-8069-1-git-send-email-peda@axentia.se>
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
On Wed, Sep 14, 2016 at 03:24:12PM +0200, Peter Rosin wrote:
> The cached value of the last selected channel prevents retries on the
> next call, even on failure to update the selected channel. Fix that.
>
> Signed-off-by: Peter Rosin <peda@axentia.se>
Looks good. Is this 4.8 material or rather 4.9?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH v7] i2c: imx: make bus recovery through pinctrl optional
From: Wolfram Sang @ 2016-09-15 19:45 UTC (permalink / raw)
To: Li Yang
Cc: linux-i2c, linux-kernel, linux-gpio, linux-arm-kernel, Gao Pan,
Uwe Kleine-König
In-Reply-To: <1473718950-6667-1-git-send-email-leoyang.li@nxp.com>
[-- Attachment #1: Type: text/plain, Size: 1023 bytes --]
On Mon, Sep 12, 2016 at 05:22:30PM -0500, Li Yang wrote:
> Since commit 1c4b6c3bcf30 ("i2c: imx: implement bus recovery") the
> driver starts to use gpio/pinctrl to support optional bus recovery
> feature. But pinctrl is not always usable. There are platforms such
> as ls1021a and ls1043a that don't support pinctrl, and it could just
> be broken due to old/broken device tree. The patch makes it really
> optional that the probe function won't bailout on pinctrl problems
> instead it just disables bus recovery and prints out notification when
> there is problem with pinctrl. Since pinctrl is only used by bus
> recovery in this driver, move pinctrl initialization into bus recovery
> init function to prevent confusion.
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> Cc: Gao Pan <pandy.gao@nxp.com>
> Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Applied to for-next. Thanks to all reviewers and to Li Yang for keeping
at it!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH 0/2] i2c: meson: add gxbb compatible string
From: Wolfram Sang @ 2016-09-15 19:41 UTC (permalink / raw)
To: Jerome Brunet
Cc: Kevin Hilman, Carlo Caione, linux-amlogic, linux-arm-kernel,
linux-i2c, Neil Armstrong
In-Reply-To: <1473846557-18123-1-git-send-email-jbrunet@baylibre.com>
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
On Wed, Sep 14, 2016 at 11:49:15AM +0200, Jerome Brunet wrote:
> This patchset adds a specific compatible string in the Meson I2C driver
> for the Amlogic Meson gxbb SoC.
>
> Other patch series (pinctrl and device tree) are being sent to complete
> the i2c support on meson gxbb
>
> Neil Armstrong (2):
> i2c: meson: add gxbb compatible string
> dt-bindings: i2c-meson: add gxbb compatible string
Squashed both patches and applied to for-next, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* i2c: xlp9xx: ACPI support for I2C clients
From: Tanmay Jagdale @ 2016-09-15 19:27 UTC (permalink / raw)
To: wsa; +Cc: linux-i2c, jayachandran.chandrashekaran, Tanmay Jagdale
The ACPI companion of the adapter has to be set for I2C controller
code to read and attach the slave devices described in the ACPI table
with the I2CSerialBus resource descriptor. Used ACPI_COMPANION_SET
macro to set this.
Signed-off-by: Tanmay Jagdale <tanmay.jagdale@broadcom.com>
---
drivers/i2c/busses/i2c-xlp9xx.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9xx.c
index 55a7bef..916f192 100644
--- a/drivers/i2c/busses/i2c-xlp9xx.c
+++ b/drivers/i2c/busses/i2c-xlp9xx.c
@@ -393,6 +393,7 @@ static int xlp9xx_i2c_probe(struct platform_device *pdev)
init_completion(&priv->msg_complete);
priv->adapter.dev.parent = &pdev->dev;
priv->adapter.algo = &xlp9xx_i2c_algo;
+ ACPI_COMPANION_SET(&(priv->adapter.dev), ACPI_COMPANION(&pdev->dev));
priv->adapter.dev.of_node = pdev->dev.of_node;
priv->dev = &pdev->dev;
--
2.1.0
^ permalink raw reply related
* Re: [PATCH] i2c: qup: skip qup_i2c_suspend if the device is already runtime suspended
From: Andy Gross @ 2016-09-14 17:33 UTC (permalink / raw)
To: Sudeep Holla
Cc: linux-kernel, linux-i2c, linux-soc, linux-arm-msm, David Brown,
Wolfram Sang
In-Reply-To: <1472124219-1627-1-git-send-email-sudeep.holla@arm.com>
On Thu, Aug 25, 2016 at 12:23:39PM +0100, Sudeep Holla wrote:
> If the i2c device is already runtime suspended, if qup_i2c_suspend is
> executed during suspend-to-idle or suspend-to-ram it will result in the
> following splat:
>
<snip>
>
> This patch fixes the issue by executing qup_i2c_pm_suspend_runtime
> conditionally in qup_i2c_suspend.
>
> Cc: Andy Gross <andy.gross@linaro.org>
> Cc: David Brown <david.brown@linaro.org>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Reviewed-by: Andy Gross <andy.gross@linro.org>
^ permalink raw reply
* Re: [PATCH 2/2] dt-bindings: i2c-meson: add gxbb compatible string
From: Kevin Hilman @ 2016-09-14 15:19 UTC (permalink / raw)
To: Jerome Brunet
Cc: Wolfram Sang, Carlo Caione, devicetree-u79uwXL29TY76Z2rM5mHXA,
Neil Armstrong, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-i2c-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1473846557-18123-3-git-send-email-jbrunet-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
Jerome Brunet <jbrunet-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> writes:
> From: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
>
> Signed-off-by: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
> Signed-off-by: Jerome Brunet <jbrunet-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
Acked-by: Kevin Hilman <khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
> ---
> Documentation/devicetree/bindings/i2c/i2c-meson.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-meson.txt b/Documentation/devicetree/bindings/i2c/i2c-meson.txt
> index 682f9a6f766e..386357d1aab0 100644
> --- a/Documentation/devicetree/bindings/i2c/i2c-meson.txt
> +++ b/Documentation/devicetree/bindings/i2c/i2c-meson.txt
> @@ -1,7 +1,7 @@
> Amlogic Meson I2C controller
>
> Required properties:
> - - compatible: must be "amlogic,meson6-i2c"
> + - compatible: must be "amlogic,meson6-i2c" or "amlogic,meson-gxbb-i2c"
> - reg: physical address and length of the device registers
> - interrupts: a single interrupt specifier
> - clocks: clock for the device
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH 1/2] i2c: meson: add gxbb compatible string
From: Kevin Hilman @ 2016-09-14 15:19 UTC (permalink / raw)
To: Jerome Brunet
Cc: Wolfram Sang, Carlo Caione, Neil Armstrong, linux-amlogic,
linux-arm-kernel, linux-i2c
In-Reply-To: <1473846557-18123-2-git-send-email-jbrunet@baylibre.com>
Jerome Brunet <jbrunet@baylibre.com> writes:
> From: Neil Armstrong <narmstrong@baylibre.com>
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Acked-by: Kevin Hilman <khilman@baylibre.com>
> ---
> drivers/i2c/busses/i2c-meson.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
> index 76e28980904f..30977e31cd98 100644
> --- a/drivers/i2c/busses/i2c-meson.c
> +++ b/drivers/i2c/busses/i2c-meson.c
> @@ -473,6 +473,7 @@ static int meson_i2c_remove(struct platform_device *pdev)
>
> static const struct of_device_id meson_i2c_match[] = {
> { .compatible = "amlogic,meson6-i2c" },
> + { .compatible = "amlogic,meson-gxbb-i2c" },
> { },
> };
> MODULE_DEVICE_TABLE(of, meson_i2c_match);
^ permalink raw reply
* [PATCH] i2c: i2c-mux-pca954x: retry updating the mux selection on failure
From: Peter Rosin @ 2016-09-14 13:24 UTC (permalink / raw)
To: open list:I2C MUXES; +Cc: Peter Rosin, Wolfram Sang, open list
The cached value of the last selected channel prevents retries on the
next call, even on failure to update the selected channel. Fix that.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index 528e755c468f..3278ebf1cc5c 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -164,7 +164,7 @@ static int pca954x_select_chan(struct i2c_mux_core *muxc, u32 chan)
/* Only select the channel if its different from the last channel */
if (data->last_chan != regval) {
ret = pca954x_reg_write(muxc->parent, client, regval);
- data->last_chan = regval;
+ data->last_chan = ret ? 0 : regval;
}
return ret;
--
2.1.4
^ permalink raw reply related
* Re: [PATCH v1 0/2] i2c: Stop i2c modules being unloaded while in use.
From: Peter Rosin @ 2016-09-14 12:57 UTC (permalink / raw)
To: Baxter, Jim, linux-i2c
Cc: Peter Korsgaard, Wolfram Sang, linux-kernel, Frkuska, Joshua,
jiwang
In-Reply-To: <91828685-c7ba-b5b2-f128-240fdf9ebb44@mentor.com>
Hi Jim!
On 2016-09-13 18:55, Baxter, Jim wrote:
> Hi Peter,
>
>> nitpick: Patch subjects for the second patch is wrong.
>>
>> "reparented" is a bit dual when dealing with i2c adapter trees.
>> i2c_mux_add_owned_adapter is perhaps clearer?
>
> Agreed, I will update that.
>
>>
>>
>> Aside from that, I'm not using modules much and need some enlightenment
>> as to why the i2c_del_mux_adapter() call in i2c_mux_gpio_remove() is not
>> sufficient and what exactly the problem is? Why would someone/something
>> unload the i2c-mux module prematurely?
>
> It is not a normal operation to remove the i2c gpio mux, however systemd
> could unload modules out of order if users are restarting services
> incorrectly and cause unintended side-effects. This change would stop an
> i2c-mux that maybe controlling a voltage regulator from being unloaded
> and disabling power to parts of the system unexpectedly.
I don't see how that can happen. The voltage regulator that sits behind
the mux should be a user of one of the child adapters on the mux, so that
child adapter can't be removed as long as the voltage regulator is there.
And the i2c-mux can't be unloaded as long as the child adapter is there,
since it is the owner. So what's going on?
Simply changing the owner of the child adapter will break this chain
leaving the i2c-mux as owner of nothing, thus *making* it a target for
premature unloading.
I must be fundamentally misunderstanding something.
BTW, was this solving a real issue, or is it all theory?
Cheers,
Peter
>> Would it be an alternative to make i2c-mux a proper kernel object of
>> some kind? I mean, why do not all other mux users also need to modify
>> the owner? Why is i2c-mux-gpio special?
>>
>
> i2c-mux-gpio is not special, the code inserted by
> [PATCH v1 1/2] i2c-mux: add i2c_mux_add_reparented_adapter api could be
> used by other muxes if required.
^ permalink raw reply
* [PATCH 1/2] i2c: meson: add gxbb compatible string
From: Jerome Brunet @ 2016-09-14 9:49 UTC (permalink / raw)
To: Wolfram Sang, Kevin Hilman, Carlo Caione
Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-i2c,
Jerome Brunet
In-Reply-To: <1473846557-18123-1-git-send-email-jbrunet@baylibre.com>
From: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/i2c/busses/i2c-meson.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index 76e28980904f..30977e31cd98 100644
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -473,6 +473,7 @@ static int meson_i2c_remove(struct platform_device *pdev)
static const struct of_device_id meson_i2c_match[] = {
{ .compatible = "amlogic,meson6-i2c" },
+ { .compatible = "amlogic,meson-gxbb-i2c" },
{ },
};
MODULE_DEVICE_TABLE(of, meson_i2c_match);
--
2.7.4
^ permalink raw reply related
* [PATCH 0/2] i2c: meson: add gxbb compatible string
From: Jerome Brunet @ 2016-09-14 9:49 UTC (permalink / raw)
To: Wolfram Sang, Kevin Hilman, Carlo Caione
Cc: Jerome Brunet, linux-amlogic, linux-arm-kernel, linux-i2c,
Neil Armstrong
This patchset adds a specific compatible string in the Meson I2C driver
for the Amlogic Meson gxbb SoC.
Other patch series (pinctrl and device tree) are being sent to complete
the i2c support on meson gxbb
Neil Armstrong (2):
i2c: meson: add gxbb compatible string
dt-bindings: i2c-meson: add gxbb compatible string
Documentation/devicetree/bindings/i2c/i2c-meson.txt | 2 +-
drivers/i2c/busses/i2c-meson.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
--
2.7.4
^ permalink raw reply
* [PATCH 2/2] dt-bindings: i2c-meson: add gxbb compatible string
From: Jerome Brunet @ 2016-09-14 9:49 UTC (permalink / raw)
To: Wolfram Sang, Kevin Hilman, Carlo Caione,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: Neil Armstrong, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-i2c-u79uwXL29TY76Z2rM5mHXA, Jerome Brunet
In-Reply-To: <1473846557-18123-1-git-send-email-jbrunet-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
From: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
Signed-off-by: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
Signed-off-by: Jerome Brunet <jbrunet-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
---
Documentation/devicetree/bindings/i2c/i2c-meson.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/i2c/i2c-meson.txt b/Documentation/devicetree/bindings/i2c/i2c-meson.txt
index 682f9a6f766e..386357d1aab0 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-meson.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-meson.txt
@@ -1,7 +1,7 @@
Amlogic Meson I2C controller
Required properties:
- - compatible: must be "amlogic,meson6-i2c"
+ - compatible: must be "amlogic,meson6-i2c" or "amlogic,meson-gxbb-i2c"
- reg: physical address and length of the device registers
- interrupts: a single interrupt specifier
- clocks: clock for the device
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related
* Re: [PATCH] MAINTAINERS: Remove myself from PA Semi entries
From: Michael Ellerman @ 2016-09-14 8:57 UTC (permalink / raw)
Cc: netdev, linux-i2c, davem, jdelvare, Olof Johansson
In-Reply-To: <1473803318-25197-1-git-send-email-olof@lixom.net>
Olof Johansson <olof@lixom.net> writes:
> The platform is old, very few users and I lack bandwidth to keep after
> it these days.
>
> Mark the base platform as well as the drivers as orphans, patches have
> been flowing through the fallback maintainers for a while already.
Sorry to see you go, but thanks for keeping an eye on it as long as you
did!
> Jean, Dave,
>
> I was hoping to have Michael merge this since the bulk of the platform is under him,
> cc:ing you mostly to be aware that I am orphaning a driver in your subsystems.
I'll merge it unless I hear otherwise from Dave.
Should we go the whole hog and just do as below? I think most folks use
get_maintainers.pl these days, so this should have basically the same
effect. Happy to go with your original version though if you prefer.
cheers
diff --git a/MAINTAINERS b/MAINTAINERS
index 0bbe4b105c34..8ca1c25d870d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7049,6 +7049,7 @@ N: powermac
N: powernv
N: [^a-z0-9]ps3
N: pseries
+N: pasemi
LINUX FOR POWER MACINTOSH
M: Benjamin Herrenschmidt <benh@kernel.crashing.org>
@@ -7098,14 +7099,6 @@ S: Maintained
F: arch/powerpc/platforms/83xx/
F: arch/powerpc/platforms/85xx/
-LINUX FOR POWERPC PA SEMI PWRFICIENT
-M: Olof Johansson <olof@lixom.net>
-L: linuxppc-dev@lists.ozlabs.org
-S: Maintained
-F: arch/powerpc/platforms/pasemi/
-F: drivers/*/*pasemi*
-F: drivers/*/*/*pasemi*
-
LINUX SECURITY MODULE (LSM) FRAMEWORK
M: Chris Wright <chrisw@sous-sol.org>
L: linux-security-module@vger.kernel.org
@@ -8773,18 +8766,6 @@ W: http://wireless.kernel.org/en/users/Drivers/p54
S: Maintained
F: drivers/net/wireless/intersil/p54/
-PA SEMI ETHERNET DRIVER
-M: Olof Johansson <olof@lixom.net>
-L: netdev@vger.kernel.org
-S: Maintained
-F: drivers/net/ethernet/pasemi/*
-
-PA SEMI SMBUS DRIVER
-M: Olof Johansson <olof@lixom.net>
-L: linux-i2c@vger.kernel.org
-S: Maintained
-F: drivers/i2c/busses/i2c-pasemi.c
-
PADATA PARALLEL EXECUTION MECHANISM
M: Steffen Klassert <steffen.klassert@secunet.com>
L: linux-crypto@vger.kernel.org
^ permalink raw reply related
* Re: [patch v5] i2c: mux: mellanox: add driver
From: Peter Rosin @ 2016-09-14 8:42 UTC (permalink / raw)
To: Vadim Pasternak, wsa@the-dreams.de
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
jiri@resnulli.us, Michael Shych
In-Reply-To: <AM5PR0501MB209778ABF3397CD457AA1A69A2F10@AM5PR0501MB2097.eurprd05.prod.outlook.com>
Wolfram, please pick up v5 for i2c-next whenever timing is right so that
it gets more testing etc. I didn't do any recent compile-testing myself,
but if you think that is required on the final version I can of course
spend some time on it. (But isn't that what all the infrastructure is
there to help with?) Thanks!
On 2016-09-14 10:10, Vadim Pasternak wrote:
> Peter Rosin wrote:
>> On 2016-09-13 22:37, vadimp@mellanox.com wrote:
>>> From: Vadim Pasternak <vadimp@mellanox.com>
>>>
>>> This driver allows I2C routing controlled through CPLD select
>>> registers on a wide range of Mellanox systems (CPLD Lattice device).
>>> MUX selection is provided by digital and analog HW. Analog part is not
>>> under SW control.
>>> Digital part is under CPLD control (channel selection/de-selection).
>>
>> *snip*
>>
>>> +/* Platform data for the CPLD I2C multiplexers */
>>> +
>>> +/* mlxcpld_mux_plat_data - per mux data, used with
>>> +i2c_register_board_info
>>> + * @adap_ids - adapter array
>>> + * @num_adaps - number of adapters
>>> + * @sel_reg_addr - mux select register offset in CPLD space */
>>> +struct mlxcpld_mux_plat_data {
>>> + int *adap_ids;
>>> + int num_adaps;
>>> + int sel_reg_addr;
>>> +};
>>> +
>>> +#endif /* _LINUX_I2C_MLXCPLD_H */
>>>
>>
>> Hmm, you never confirmed that you need to support different register values in
>> the CPLD with sel_reg_addr. I can see that there is a possibility that you actually
>> really need it, but I'd like to remove that variable if at all possible.
>
> Yes, it could be different register values.
> Actually CPLD can also be programmed in different way.
> So, I really need it.
Oh well :-)
Cheers,
Peter
>>
>> If you can confirm that you need that, this is
>>
>> Acked-by: Peter Rosin <peda@axentia.se>
^ permalink raw reply
* Re: [PATCH] MAINTAINERS: Remove myself from PA Semi entries
From: Wolfram Sang @ 2016-09-14 8:36 UTC (permalink / raw)
To: Olof Johansson; +Cc: Michael Ellerman, netdev, linux-i2c, davem, jdelvare
In-Reply-To: <20160914003157.GA1420@katana>
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
> > I was hoping to have Michael merge this since the bulk of the platform is under him,
> > cc:ing you mostly to be aware that I am orphaning a driver in your subsystems.
>
> Let me answer for Jean since I took over I2C in November 2012 ;) I'd
> think the entry can go completely. The last 'F:' tag for the platform
> catches the I2C driver anyhow. But in general:
To make it crystal clear: I meant the I2C entry for PASEMI could go.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* RE: [patch v5] i2c: mux: mellanox: add driver
From: Vadim Pasternak @ 2016-09-14 8:10 UTC (permalink / raw)
To: Peter Rosin, wsa@the-dreams.de
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
jiri@resnulli.us, Michael Shych
In-Reply-To: <eb927385-4598-2fd0-8200-7d6c4945569f@axentia.se>
> -----Original Message-----
> From: Peter Rosin [mailto:peda@axentia.se]
> Sent: Wednesday, September 14, 2016 10:50 AM
> To: Vadim Pasternak <vadimp@mellanox.com>; wsa@the-dreams.de
> Cc: linux-i2c@vger.kernel.org; linux-kernel@vger.kernel.org; jiri@resnulli.us;
> Michael Shych <michaelsh@mellanox.com>
> Subject: Re: [patch v5] i2c: mux: mellanox: add driver
>
> On 2016-09-13 22:37, vadimp@mellanox.com wrote:
> > From: Vadim Pasternak <vadimp@mellanox.com>
> >
> > This driver allows I2C routing controlled through CPLD select
> > registers on a wide range of Mellanox systems (CPLD Lattice device).
> > MUX selection is provided by digital and analog HW. Analog part is not
> > under SW control.
> > Digital part is under CPLD control (channel selection/de-selection).
>
> *snip*
>
> > +/* Platform data for the CPLD I2C multiplexers */
> > +
> > +/* mlxcpld_mux_plat_data - per mux data, used with
> > +i2c_register_board_info
> > + * @adap_ids - adapter array
> > + * @num_adaps - number of adapters
> > + * @sel_reg_addr - mux select register offset in CPLD space */
> > +struct mlxcpld_mux_plat_data {
> > + int *adap_ids;
> > + int num_adaps;
> > + int sel_reg_addr;
> > +};
> > +
> > +#endif /* _LINUX_I2C_MLXCPLD_H */
> >
>
> Hmm, you never confirmed that you need to support different register values in
> the CPLD with sel_reg_addr. I can see that there is a possibility that you actually
> really need it, but I'd like to remove that variable if at all possible.
Yes, it could be different register values.
Actually CPLD can also be programmed in different way.
So, I really need it.
>
> If you can confirm that you need that, this is
>
> Acked-by: Peter Rosin <peda@axentia.se>
>
> Otherwise, please just hard code the register address.
>
> Cheers,
> Peter
^ permalink raw reply
* Re: RESEND:i2c-eg20t: fix race between i2c init and interrupt enable
From: Yadi @ 2016-09-14 7:49 UTC (permalink / raw)
To: Wolfram Sang; +Cc: jdelvare, linux-i2c
In-Reply-To: <20160914072809.GA1417@katana>
On 2016年09月14日 15:28, Wolfram Sang wrote:
>> after testing last patch, replacing request_irq() location is not a
>> good idea,it might produce a little time windows ,in which the interrupts
>> occurring inside will be omitted.
> To give you a little feedback: I think I liked the previous patch
> better, but need the weekend to think about it.
>
> Thanks,
>
> Wolfram
>
thanks your feedback.
Yadi
^ permalink raw reply
* Re: [patch v5] i2c: mux: mellanox: add driver
From: Peter Rosin @ 2016-09-14 7:49 UTC (permalink / raw)
To: vadimp, wsa; +Cc: linux-i2c, linux-kernel, jiri, Michael Shych
In-Reply-To: <1473799071-12830-1-git-send-email-vadimp@mellanox.com>
On 2016-09-13 22:37, vadimp@mellanox.com wrote:
> From: Vadim Pasternak <vadimp@mellanox.com>
>
> This driver allows I2C routing controlled through CPLD select registers on
> a wide range of Mellanox systems (CPLD Lattice device).
> MUX selection is provided by digital and analog HW. Analog part is not
> under SW control.
> Digital part is under CPLD control (channel selection/de-selection).
*snip*
> +/* Platform data for the CPLD I2C multiplexers */
> +
> +/* mlxcpld_mux_plat_data - per mux data, used with i2c_register_board_info
> + * @adap_ids - adapter array
> + * @num_adaps - number of adapters
> + * @sel_reg_addr - mux select register offset in CPLD space
> + */
> +struct mlxcpld_mux_plat_data {
> + int *adap_ids;
> + int num_adaps;
> + int sel_reg_addr;
> +};
> +
> +#endif /* _LINUX_I2C_MLXCPLD_H */
>
Hmm, you never confirmed that you need to support different register
values in the CPLD with sel_reg_addr. I can see that there is a
possibility that you actually really need it, but I'd like to remove
that variable if at all possible.
If you can confirm that you need that, this is
Acked-by: Peter Rosin <peda@axentia.se>
Otherwise, please just hard code the register address.
Cheers,
Peter
^ permalink raw reply
* Re: RESEND:i2c-eg20t: fix race between i2c init and interrupt enable
From: Wolfram Sang @ 2016-09-14 7:28 UTC (permalink / raw)
To: Yadi Hu; +Cc: jdelvare, linux-i2c
In-Reply-To: <1473240337-5694-1-git-send-email-yadi.hu@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
> after testing last patch, replacing request_irq() location is not a
> good idea,it might produce a little time windows ,in which the interrupts
> occurring inside will be omitted.
To give you a little feedback: I think I liked the previous patch
better, but need the weekend to think about it.
Thanks,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: RESEND:i2c-eg20t: fix race between i2c init and interrupt enable
From: Yadi @ 2016-09-14 6:39 UTC (permalink / raw)
To: wsa, jdelvare; +Cc: linux-i2c
In-Reply-To: <1473240337-5694-1-git-send-email-yadi.hu@windriver.com>
ping once again, any objection?
Yadi
On 2016年09月07日 17:25, Yadi Hu wrote:
> the eg20t driver call request_irq() function before the pch_base_address,
> base address of i2c controller's register, isassigned an effective value.
>
> it is one possible scenario that an interrupt which isn't inside eg20t
> arrives immediately after request_irq() is executed when i2c controller
> shares an interrupt number with others. since the interrupt handler
> pch_i2c_handler() has already active as shared action, it will be called
> and read its own register to determine if this interrupt is from itself.
>
> At that moment, since base address of i2c registers is not remapped
> in kernel space yet,so the INT handler will access an illegal address
> and then a error occurs.
>
> Bad IO access at port 0x18 (return inl(port))
> Call Trace:
> [<c102c733>] warn_slowpath_common+0x73/0xa0
> [<c13109f5>] ? bad_io_access+0x45/0x50
> [<c13109f5>] ? bad_io_access+0x45/0x50
> [<c102c804>] warn_slowpath_fmt+0x34/0x40
> [<c13109f5>] bad_io_access+0x45/0x50
> [<c1310b62>] ioread32+0x22/0x40
> [<c14c60db>] pch_i2c_handler+0x3b/0x120
> [<c1092f34>] handle_irq_event_percpu+0x64/0x330
> [<c109323b>] handle_irq_event+0x3b/0x60
> [<c1095b50>] ? unmask_irq+0x30/0x30
> [<c1095ba0>] handle_fasteoi_irq+0x50/0xe0
> <IRQ> [<c16e7e78>] ? do_IRQ+0x48/0xc0
> [<c16e7f6f>] ? smp_apic_timer_interrupt+0x7f/0x17a
> [<c16e7da9>] ? common_interrupt+0x29/0x30
> [<c1008ebb>] ? mwait_idle+0x8b/0x2c0
> [<c1009e8e>] ? cpu_idle+0x9e/0xc0
> [<c16be408>] ? rest_init+0x6c/0x74
> [<c19f770a>] ? start_kernel+0x311/0x318
> [<c19f7231>] ? repair_env_string+0x51/0x51
> [<c19f7078>] ? i386_start_kernel+0x78/0x7d
> ---[ end trace eb3a1028f468a140 ]---
> i2c_eg20t 0000:05:0c.2: pch_i2c_handler :I2C-3 mode(0) is not supported
>
> after testing last patch, replacing request_irq() location is not a
> good idea,it might produce a little time windows ,in which the interrupts
> occurring inside will be omitted.
>
> the new patch adds a check point on interrupt handler in case field
> 'pch_base_address' has not been initialed.
>
>
> Yadi Hu (1)
> i2c-eg20t: fix race between i2c init and interrupt enable
>
> drivers/i2c/busses/i2c-eg20t.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
^ permalink raw reply
* Re: [PATCH] MAINTAINERS: Remove myself from PA Semi entries
From: Wolfram Sang @ 2016-09-14 0:31 UTC (permalink / raw)
To: Olof Johansson; +Cc: Michael Ellerman, netdev, linux-i2c, davem, jdelvare
In-Reply-To: <1473803318-25197-1-git-send-email-olof@lixom.net>
[-- Attachment #1: Type: text/plain, Size: 2114 bytes --]
On Tue, Sep 13, 2016 at 02:48:38PM -0700, Olof Johansson wrote:
> The platform is old, very few users and I lack bandwidth to keep after
> it these days.
>
> Mark the base platform as well as the drivers as orphans, patches have
> been flowing through the fallback maintainers for a while already.
>
> Signed-off-by: Olof Johansson <olof@lixom.net>
> ---
>
> Jean, Dave,
>
> I was hoping to have Michael merge this since the bulk of the platform is under him,
> cc:ing you mostly to be aware that I am orphaning a driver in your subsystems.
Let me answer for Jean since I took over I2C in November 2012 ;) I'd
think the entry can go completely. The last 'F:' tag for the platform
catches the I2C driver anyhow. But in general:
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Thanks,
Wolfram
>
>
> Thanks,
>
> -Olof
>
> MAINTAINERS | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index d8e81b1..411f4f7 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -7155,9 +7155,8 @@ F: arch/powerpc/platforms/83xx/
> F: arch/powerpc/platforms/85xx/
>
> LINUX FOR POWERPC PA SEMI PWRFICIENT
> -M: Olof Johansson <olof@lixom.net>
> L: linuxppc-dev@lists.ozlabs.org
> -S: Maintained
> +S: Orphan
> F: arch/powerpc/platforms/pasemi/
> F: drivers/*/*pasemi*
> F: drivers/*/*/*pasemi*
> @@ -8849,15 +8848,13 @@ S: Maintained
> F: drivers/net/wireless/intersil/p54/
>
> PA SEMI ETHERNET DRIVER
> -M: Olof Johansson <olof@lixom.net>
> L: netdev@vger.kernel.org
> -S: Maintained
> +S: Orphan
> F: drivers/net/ethernet/pasemi/*
>
> PA SEMI SMBUS DRIVER
> -M: Olof Johansson <olof@lixom.net>
> L: linux-i2c@vger.kernel.org
> -S: Maintained
> +S: Orphan
> F: drivers/i2c/busses/i2c-pasemi.c
>
> PADATA PARALLEL EXECUTION MECHANISM
> --
> 2.8.0.rc3.29.gb552ff8
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [v11, 5/8] soc: fsl: add GUTS driver for QorIQ platforms
From: Scott Wood @ 2016-09-13 22:24 UTC (permalink / raw)
To: Y.B. Lu, linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
Arnd Bergmann
Cc: Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Russell King, Bhupesh Sharma,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Santosh Shilimkar,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Jochen Friedrich, X.B. Xie,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
Rob Herring, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Claudiu Manoil, Kumar Gala, Leo Li,
linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
In-Reply-To: <HE1PR04MB08892E63EB2D579D6F0A7550F8FE0-6LN7OEpIatX1kPMWxTxe+c9NdZoXdze2vxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
On Tue, 2016-09-13 at 07:23 +0000, Y.B. Lu wrote:
> >
> >
> > -----Original Message-----
> > From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc-
> > owner@vger.kernel.org] On Behalf Of Scott Wood
> > Sent: Tuesday, September 13, 2016 7:25 AM
> > To: Y.B. Lu; linux-mmc@vger.kernel.org; ulf.hansson@linaro.org; Arnd
> > Bergmann
> > Cc: linuxppc-dev@lists.ozlabs.org; devicetree@vger.kernel.org; linux-arm-
> > kernel@lists.infradead.org; linux-kernel@vger.kernel.org; linux-
> > clk@vger.kernel.org; linux-i2c@vger.kernel.org; iommu@lists.linux-
> > foundation.org; netdev@vger.kernel.org; Mark Rutland; Rob Herring;
> > Russell King; Jochen Friedrich; Joerg Roedel; Claudiu Manoil; Bhupesh
> > Sharma; Qiang Zhao; Kumar Gala; Santosh Shilimkar; Leo Li; X.B. Xie
> > Subject: Re: [v11, 5/8] soc: fsl: add GUTS driver for QorIQ platforms
> >
> > BTW, aren't ls2080a and ls2085a the same die? And is there no non-E
> > version of LS2080A/LS2040A?
> [Lu Yangbo-B47093] I checked all the svr values in chip errata doc "Revision
> level to part marking cross-reference" table.
> I found ls2080a and ls2085a were in two separate doc. And I didn’t find non-
> E version of LS2080A/LS2040A in chip errata doc.
> Do you know is there any other doc we can confirm this?
No. Traditionally we've always had E and non-E versions of each chip, but I
have no knowledge of whether that has changed (I do note that the way that E-
status is indicated in SVR has changed).
But please label LS2080A and LS2085A as the same die (or provide strong
evidence that they are not).
>
> >
> >
> > >
> > > > >
> > > > > + do {
> > > > > + if (!matches->soc_id)
> > > > > + return NULL;
> > > > > + if (glob_match(svr_match, matches->soc_id))
> > > > > + break;
> > > > > + } while (matches++);
> > > > Are you expecting "matches++" to ever evaluate as false?
> > > [Lu Yangbo-B47093] Yes, this is used to match the soc we use in
> > > qoriq_soc array until getting true.
> > > We need to get the name and die information defined in array.
> > I'm not asking whether the glob_match will ever return true. I'm saying
> > that "matches++" will never become NULL.
> [Lu Yangbo-B47093] The matches++ will never become NULL while it will return
> NULL after matching for all the members in array.
"matches++" will never "return NULL". It's just an incrementing address. It
won't be null until you wrap around the address space, and even if the other
loop terminators never kicked in you'd crash long before that happens.
Please rewrite the loop as something like:
while (matches->soc_id) {
if (glob_match(...))
return matches;
matches++;
}
return NULL;
> > > > > + /* Register soc device */
> > > > > + soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
> > > > > + if (!soc_dev_attr) {
> > > > > + ret = -ENOMEM;
> > > > > + goto out_unmap;
> > > > > + }
> > > > Couldn't this be statically allocated?
> > > [Lu Yangbo-B47093] Do you mean we define this struct statically ?
> > >
> > > static struct soc_device_attribute soc_dev_attr;
> > Yes.
> >
> [Lu Yangbo-B47093] It's ok to define it statically. Is there any need to do
> that?
It's simpler.
-Scott
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply
* [PATCH] MAINTAINERS: Remove myself from PA Semi entries
From: Olof Johansson @ 2016-09-13 21:48 UTC (permalink / raw)
To: Michael Ellerman; +Cc: netdev, linux-i2c, davem, jdelvare, Olof Johansson
The platform is old, very few users and I lack bandwidth to keep after
it these days.
Mark the base platform as well as the drivers as orphans, patches have
been flowing through the fallback maintainers for a while already.
Signed-off-by: Olof Johansson <olof@lixom.net>
---
Jean, Dave,
I was hoping to have Michael merge this since the bulk of the platform is under him,
cc:ing you mostly to be aware that I am orphaning a driver in your subsystems.
Thanks,
-Olof
MAINTAINERS | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index d8e81b1..411f4f7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7155,9 +7155,8 @@ F: arch/powerpc/platforms/83xx/
F: arch/powerpc/platforms/85xx/
LINUX FOR POWERPC PA SEMI PWRFICIENT
-M: Olof Johansson <olof@lixom.net>
L: linuxppc-dev@lists.ozlabs.org
-S: Maintained
+S: Orphan
F: arch/powerpc/platforms/pasemi/
F: drivers/*/*pasemi*
F: drivers/*/*/*pasemi*
@@ -8849,15 +8848,13 @@ S: Maintained
F: drivers/net/wireless/intersil/p54/
PA SEMI ETHERNET DRIVER
-M: Olof Johansson <olof@lixom.net>
L: netdev@vger.kernel.org
-S: Maintained
+S: Orphan
F: drivers/net/ethernet/pasemi/*
PA SEMI SMBUS DRIVER
-M: Olof Johansson <olof@lixom.net>
L: linux-i2c@vger.kernel.org
-S: Maintained
+S: Orphan
F: drivers/i2c/busses/i2c-pasemi.c
PADATA PARALLEL EXECUTION MECHANISM
--
2.8.0.rc3.29.gb552ff8
^ permalink raw reply related
* [patch v5] i2c: mux: mellanox: add driver
From: vadimp @ 2016-09-13 20:37 UTC (permalink / raw)
To: wsa, peda; +Cc: linux-i2c, linux-kernel, jiri, Vadim Pasternak, Michael Shych
From: Vadim Pasternak <vadimp@mellanox.com>
This driver allows I2C routing controlled through CPLD select registers on
a wide range of Mellanox systems (CPLD Lattice device).
MUX selection is provided by digital and analog HW. Analog part is not
under SW control.
Digital part is under CPLD control (channel selection/de-selection).
Connectivity schema.
i2c-mlxcpld Digital Analog
driver
*--------* * -> mux1 (virt bus2) -> mux ->|
| I2CLPC | i2c physical * -> mux2 (virt bus3) -> mux ->|
| bridge | bus 1 *---------* |
| logic |---------------------> * mux reg * |
| in CPLD| *---------* |
*--------* i2c-mux-mlxpcld ^ * -> muxn (virt busn) -> mux ->|
| driver | |
| *---------------* | Devices
| * CPLD (i2c bus)* select |
| * registers for *--------*
| * mux selection * deselect
| *---------------*
| |
<--------> <----------->
i2c cntrl Board cntrl reg
reg space space (mux select,
IO, LED, WD, info)
i2c-mux-mlxpcld does not necessarily require i2c-mlxcpld. It can be used
along with another bus driver, and still control i2c routing through CPLD
mux selection, in case the system is equipped with CPLD capable of mux
selection control.
The Kconfig currently controlling compilation of this code is:
drivers/i2c/muxes/Kconfig:config I2C_MUX_MLXCPLD
Signed-off-by: Michael Shych <michaelsh@mellanox.com>
Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
---
v4->v5
Fixes issues pointed out by Peter:
- Fix text is submit message;
- Fix text in Kconfig;
- Arrange Makefile in alphabetic order;
- Fix several comments;
- Drop assignment for force to zero in probe;
- Remove error message in probe - error message from i2c_mux_add_adapter
is sufficient;
v3->v4
Fixes issues pointed out by Peter:
- Remove mlxcpld_mux_type;
- Remove member type from mux control structure;
- Remove variable muxes;
- mlxcpld_mux_reg_write - set address from client;
- mlxcpld_mux_reg_write - try smbus_xfer
- mlxcpld_mux_select_chan - remove compare with for mux type;
- mlxcpld_mux_probe - use I2C_FUNC_SMBUS_WRITE_BYTE_DATA instead of
I2C_FUNC_SMBUS_BYTE
- mlxcpld_mux_probe - remove switch statement
- mlxcpld_mux_probe - update comment;
- mlxcpld_mux_probe -change logic in testing num_adaps;
- remove members first_channel and addr from mlxcpld_mux_plat_data
structure;
v2->v3
Fixes issues pointed out by Peter:
- Fix several comments;
- In MAINTAINERS file use linux-i2c instead of linux-kernel;
- Place include files in alphabetic order;
- When channel select fail, set last_chan to zero for cleaning last value;
- Return with error from probe if there is no platform data;
- Use i2c_mux_reg driver for the lpc_access cases:
it fit well for Mellanox system with LPC access - has been tested and it
works good.
- Limit this driver to i2c_access only one device (mlxcpld_mux_module).
v1->v2
Fixes issues pointed out by Peter:
- changes in commit cover massage;
- change leg to channel in comments;
- missed return err;
- use platform data mux array rather the offset from 1st channel in probe
routine;
- remove owner field from driver structure;
- use module_i2c_driver macros, instead if __init and __exit;
- remove deselect on exit flag;
- add record to MAINTAINER file;
---
MAINTAINERS | 8 ++
drivers/i2c/muxes/Kconfig | 11 ++
drivers/i2c/muxes/Makefile | 1 +
drivers/i2c/muxes/i2c-mux-mlxcpld.c | 220 ++++++++++++++++++++++++++++++++++++
include/linux/i2c/mlxcpld.h | 52 +++++++++
5 files changed, 292 insertions(+)
create mode 100644 drivers/i2c/muxes/i2c-mux-mlxcpld.c
create mode 100644 include/linux/i2c/mlxcpld.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 0bbe4b1..be83d69 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7655,6 +7655,14 @@ W: http://www.mellanox.com
Q: http://patchwork.ozlabs.org/project/netdev/list/
F: drivers/net/ethernet/mellanox/mlxsw/
+MELLANOX MLXCPLD I2C MUX DRIVER
+M: Vadim Pasternak <vadimp@mellanox.com>
+M: Michael Shych <michaelsh@mellanox.com>
+L: linux-i2c@vger.kernel.org
+S: Supported
+W: http://www.mellanox.com
+F: drivers/i2c/muxes/i2c-mux-mlxcpld.c
+
SOFT-ROCE DRIVER (rxe)
M: Moni Shoua <monis@mellanox.com>
L: linux-rdma@vger.kernel.org
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index e280c8e..d033402 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -81,4 +81,15 @@ config I2C_DEMUX_PINCTRL
demultiplexer that uses the pinctrl subsystem. This is useful if you
want to change the I2C master at run-time depending on features.
+config I2C_MUX_MLXCPLD
+ tristate "Mellanox CPLD based I2C multiplexer"
+ help
+ If you say yes to this option, support will be included for a
+ CPLD based I2C multiplexer. This driver provides access to
+ I2C busses connected through a MUX, which is controlled
+ by a CPLD register.
+
+ This driver can also be built as a module. If so, the module
+ will be called i2c-mux-mlxcpld.
+
endmenu
diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
index 7c267c2..9948fa4 100644
--- a/drivers/i2c/muxes/Makefile
+++ b/drivers/i2c/muxes/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_I2C_ARB_GPIO_CHALLENGE) += i2c-arb-gpio-challenge.o
obj-$(CONFIG_I2C_DEMUX_PINCTRL) += i2c-demux-pinctrl.o
obj-$(CONFIG_I2C_MUX_GPIO) += i2c-mux-gpio.o
+obj-$(CONFIG_I2C_MUX_MLXCPLD) += i2c-mux-mlxcpld.o
obj-$(CONFIG_I2C_MUX_PCA9541) += i2c-mux-pca9541.o
obj-$(CONFIG_I2C_MUX_PCA954x) += i2c-mux-pca954x.o
obj-$(CONFIG_I2C_MUX_PINCTRL) += i2c-mux-pinctrl.o
diff --git a/drivers/i2c/muxes/i2c-mux-mlxcpld.c b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
new file mode 100644
index 0000000..20be25a
--- /dev/null
+++ b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
@@ -0,0 +1,220 @@
+/*
+ * drivers/i2c/muxes/i2c-mux-mlxcpld.c
+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2016 Michael Shych <michaels@mellanox.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/device.h>
+#include <linux/i2c.h>
+#include <linux/i2c-mux.h>
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/version.h>
+#include <linux/i2c/mlxcpld.h>
+
+#define CPLD_MUX_MAX_NCHANS 8
+
+/* mlxcpld_mux - mux control structure:
+ * @last_chan - last register value
+ * @client - I2C device client
+ */
+struct mlxcpld_mux {
+ u8 last_chan;
+ struct i2c_client *client;
+};
+
+/* MUX logic description.
+ * Driver can support different mux control logic, according to CPLD
+ * implementation.
+ *
+ * Connectivity schema.
+ *
+ * i2c-mlxcpld Digital Analog
+ * driver
+ * *--------* * -> mux1 (virt bus2) -> mux -> |
+ * | I2CLPC | i2c physical * -> mux2 (virt bus3) -> mux -> |
+ * | bridge | bus 1 *---------* |
+ * | logic |---------------------> * mux reg * |
+ * | in CPLD| *---------* |
+ * *--------* i2c-mux-mlxpcld ^ * -> muxn (virt busn) -> mux -> |
+ * | driver | |
+ * | *---------------* | Devices
+ * | * CPLD (i2c bus)* select |
+ * | * registers for *--------*
+ * | * mux selection * deselect
+ * | *---------------*
+ * | |
+ * <--------> <----------->
+ * i2c cntrl Board cntrl reg
+ * reg space space (mux select,
+ * IO, LED, WD, info)
+ *
+ */
+
+static const struct i2c_device_id mlxcpld_mux_id[] = {
+ { "mlxcpld_mux_module", 0 },
+ { }
+};
+MODULE_DEVICE_TABLE(i2c, mlxcpld_mux_id);
+
+/* Write to mux register. Don't use i2c_transfer() and i2c_smbus_xfer()
+ * for this as they will try to lock adapter a second time.
+ */
+static int mlxcpld_mux_reg_write(struct i2c_adapter *adap,
+ struct i2c_client *client, u8 val)
+{
+ struct mlxcpld_mux_plat_data *pdata = dev_get_platdata(&client->dev);
+
+ if (adap->algo->master_xfer) {
+ struct i2c_msg msg;
+ u8 msgbuf[] = {pdata->sel_reg_addr, val};
+
+ msg.addr = client->addr;
+ msg.flags = 0;
+ msg.len = 2;
+ msg.buf = msgbuf;
+ return __i2c_transfer(adap, &msg, 1);
+ } else if (adap->algo->smbus_xfer) {
+ union i2c_smbus_data data;
+
+ data.byte = val;
+ return adap->algo->smbus_xfer(adap, client->addr,
+ client->flags, I2C_SMBUS_WRITE,
+ pdata->sel_reg_addr,
+ I2C_SMBUS_BYTE_DATA, &data);
+ } else
+ return -ENODEV;
+}
+
+static int mlxcpld_mux_select_chan(struct i2c_mux_core *muxc, u32 chan)
+{
+ struct mlxcpld_mux *data = i2c_mux_priv(muxc);
+ struct i2c_client *client = data->client;
+ u8 regval = chan + 1;
+ int err = 0;
+
+ /* Only select the channel if its different from the last channel */
+ if (data->last_chan != regval) {
+ err = mlxcpld_mux_reg_write(muxc->parent, client, regval);
+ if (err)
+ data->last_chan = 0;
+ else
+ data->last_chan = regval;
+ }
+
+ return err;
+}
+
+static int mlxcpld_mux_deselect(struct i2c_mux_core *muxc, u32 chan)
+{
+ struct mlxcpld_mux *data = i2c_mux_priv(muxc);
+ struct i2c_client *client = data->client;
+
+ /* Deselect active channel */
+ data->last_chan = 0;
+
+ return mlxcpld_mux_reg_write(muxc->parent, client, data->last_chan);
+}
+
+/* Probe/reomove functions */
+static int mlxcpld_mux_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
+ struct mlxcpld_mux_plat_data *pdata = dev_get_platdata(&client->dev);
+ struct i2c_mux_core *muxc;
+ int num, force;
+ struct mlxcpld_mux *data;
+ int err;
+
+ if (!pdata)
+ return -EINVAL;
+
+ if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
+ return -ENODEV;
+
+ muxc = i2c_mux_alloc(adap, &client->dev, CPLD_MUX_MAX_NCHANS,
+ sizeof(*data), 0, mlxcpld_mux_select_chan,
+ mlxcpld_mux_deselect);
+ if (!muxc)
+ return -ENOMEM;
+
+ data = i2c_mux_priv(muxc);
+ i2c_set_clientdata(client, muxc);
+ data->client = client;
+ data->last_chan = 0; /* force the first selection */
+
+ /* Create an adapter for each channel. */
+ for (num = 0; num < CPLD_MUX_MAX_NCHANS; num++) {
+ if (num >= pdata->num_adaps)
+ /* discard unconfigured channels */
+ break;
+
+ force = pdata->adap_ids[num];
+
+ err = i2c_mux_add_adapter(muxc, force, num, 0);
+ if (err)
+ goto virt_reg_failed;
+ }
+
+ return 0;
+
+virt_reg_failed:
+ i2c_mux_del_adapters(muxc);
+ return err;
+}
+
+static int mlxcpld_mux_remove(struct i2c_client *client)
+{
+ struct i2c_mux_core *muxc = i2c_get_clientdata(client);
+
+ i2c_mux_del_adapters(muxc);
+ return 0;
+}
+
+static struct i2c_driver mlxcpld_mux_driver = {
+ .driver = {
+ .name = "mlxcpld-mux",
+ },
+ .probe = mlxcpld_mux_probe,
+ .remove = mlxcpld_mux_remove,
+ .id_table = mlxcpld_mux_id,
+};
+
+module_i2c_driver(mlxcpld_mux_driver);
+
+MODULE_AUTHOR("Michael Shych (michaels@mellanox.com)");
+MODULE_DESCRIPTION("Mellanox I2C-CPLD-MUX driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:i2c-mux-mlxcpld");
diff --git a/include/linux/i2c/mlxcpld.h b/include/linux/i2c/mlxcpld.h
new file mode 100644
index 0000000..b08dcb1
--- /dev/null
+++ b/include/linux/i2c/mlxcpld.h
@@ -0,0 +1,52 @@
+/*
+ * mlxcpld.h - Mellanox I2C multiplexer support in CPLD
+ *
+ * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2016 Michael Shych <michaels@mellanox.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LINUX_I2C_MLXCPLD_H
+#define _LINUX_I2C_MLXCPLD_H
+
+/* Platform data for the CPLD I2C multiplexers */
+
+/* mlxcpld_mux_plat_data - per mux data, used with i2c_register_board_info
+ * @adap_ids - adapter array
+ * @num_adaps - number of adapters
+ * @sel_reg_addr - mux select register offset in CPLD space
+ */
+struct mlxcpld_mux_plat_data {
+ int *adap_ids;
+ int num_adaps;
+ int sel_reg_addr;
+};
+
+#endif /* _LINUX_I2C_MLXCPLD_H */
--
2.1.4
^ permalink raw reply related
* RE: [patch v4] i2c: mux: mellanox: add driver
From: Vadim Pasternak @ 2016-09-13 18:37 UTC (permalink / raw)
To: Peter Rosin, wsa@the-dreams.de
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
jiri@resnulli.us, Michael Shych
In-Reply-To: <9ee51a2a-83c4-f96d-09dd-5eeda233b3b5@axentia.se>
> -----Original Message-----
> From: Peter Rosin [mailto:peda@axentia.se]
> Sent: Tuesday, September 13, 2016 5:36 PM
> To: Vadim Pasternak <vadimp@mellanox.com>; wsa@the-dreams.de
> Cc: linux-i2c@vger.kernel.org; linux-kernel@vger.kernel.org; jiri@resnulli.us;
> Michael Shych <michaelsh@mellanox.com>
> Subject: Re: [patch v4] i2c: mux: mellanox: add driver
>
> It's shaping up, a few last nitpicks...
>
> On 2016-09-13 16:38, vadimp@mellanox.com wrote:
> > From: Vadim Pasternak <vadimp@mellanox.com>
> >
> > This driver allows I2C routing controlled through CPLD select
> > registers on wide range of Mellanox systems (CPLD Lattice device).
>
> s/wide/a wide/
>
> But is it really still "a wide range" now that i2c-mux-reg handles most CPLD mux
> types?
Yes. For all 1U systems we have port CPLD, where CPLD attached to i2c bus. And all QSFP are connected through this i2c CPLD muxes.
So, we'll use both mux drivers on most of our systems.
Thanks you very much for all your reviews.
>
> > MUX selection is provided by digital and analog HW. Analog part is not
> > under SW control.
> > Digital part is under CPLD control (channel selection/de-selection).
> >
> > Connectivity schema.
> > i2c-mlxcpld Digital Analog
> > driver
> > *--------* * -> mux1 (virt bus2) -> mux ->|
> > | I2CLPC | i2c physical * -> mux2 (virt bus3) -> mux ->|
> > | bridge | bus 1 *---------* |
> > | logic |---------------------> * mux reg * |
> > | in CPLD| *---------* |
> > *--------* i2c-mux-mlxpcld ^ * -> muxn (virt busn) -> mux ->|
> > | driver | |
> > | *---------------* | Devices
> > | * CPLD (i2c bus)* select |
> > | * registers for *--------*
> > | * mux selection * deselect
> > | *---------------*
> > | |
> > <--------> <----------->
> > i2c cntrl Board cntrl reg
> > reg space space (mux select,
> > IO, LED, WD, info)
> >
> > i2c-mux-mlxpcld does not necessarily require i2c-mlxcpld. It can be
> > use
>
> s/use/used/
>
> > along with another bus driver, and still control i2c routing through
> > CPLD mux selection, in case the system is equipped with CPLD capable
> > of mux selection control.
> >
> > The Kconfig currently controlling compilation of this code is:
> > drivers/i2c/muxes/Kconfig:config I2C_MUX_MLXCPLD
> >
> > Signed-off-by: Michael Shych <michaelsh@mellanox.com>
> > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
> > Reviewed-by: Jiri Pirko <jiri@mellanox.com>
> > ---
> > v3->v4
> > Fixes issues pointed out by Peter:
> > - Remove mlxcpld_mux_type;
> > - Remove member type from mux control structure;
> > - Remove variable muxes;
> > - mlxcpld_mux_reg_write - set address from client;
> > - mlxcpld_mux_reg_write - try smbus_xfer
> > - mlxcpld_mux_select_chan - remove compare with for mux type;
> > - mlxcpld_mux_probe - use I2C_FUNC_SMBUS_WRITE_BYTE_DATA instead
> of
> > I2C_FUNC_SMBUS_BYTE
> > - mlxcpld_mux_probe - remove switch statement
> > - mlxcpld_mux_probe - update comment;
> > - mlxcpld_mux_probe -change logic in testing num_adaps;
> > - remove members first_channel and addr from mlxcpld_mux_plat_data
> > structure;
> > v2->v3
> > Fixes issues pointed out by Peter:
> > - Fix several comments;
> > - In MAINTAINERS file use linux-i2c instead of linux-kernel;
> > - Place include files in alphabetic order;
> > - When channel select fail, set last_chan to zero for cleaning last value;
> > - Return with error from probe if there is no platform data;
> > - Use i2c_mux_reg driver for the lpc_access cases:
> > it fit well for Mellanox system with LPC access - has been tested and it
> > works good.
> > - Limit this driver to i2c_access only one device (mlxcpld_mux_module).
> > v1->v2
> > Fixes issues pointed out by Peter:
> > - changes in commit cover massage;
> > - change leg to channel in comments;
> > - missed return err;
> > - use platform data mux array rather the offset from 1st channel in probe
> > routine;
> > - remove owner field from driver structure;
> > - use module_i2c_driver macros, instead if __init and __exit;
> > - remove deselect on exit flag;
> > - add record to MAINTAINER file;
> > ---
> > MAINTAINERS | 8 ++
> > drivers/i2c/muxes/Kconfig | 11 ++
> > drivers/i2c/muxes/Makefile | 1 +
> > drivers/i2c/muxes/i2c-mux-mlxcpld.c | 224
> ++++++++++++++++++++++++++++++++++++
> > include/linux/i2c/mlxcpld.h | 52 +++++++++
> > 5 files changed, 296 insertions(+)
> > create mode 100644 drivers/i2c/muxes/i2c-mux-mlxcpld.c
> > create mode 100644 include/linux/i2c/mlxcpld.h
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS index 0bbe4b1..be83d69 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -7655,6 +7655,14 @@ W: http://www.mellanox.com
> > Q: http://patchwork.ozlabs.org/project/netdev/list/
> > F: drivers/net/ethernet/mellanox/mlxsw/
> >
> > +MELLANOX MLXCPLD I2C MUX DRIVER
> > +M: Vadim Pasternak <vadimp@mellanox.com>
> > +M: Michael Shych <michaelsh@mellanox.com>
> > +L: linux-i2c@vger.kernel.org
> > +S: Supported
> > +W: http://www.mellanox.com
> > +F: drivers/i2c/muxes/i2c-mux-mlxcpld.c
> > +
> > SOFT-ROCE DRIVER (rxe)
> > M: Moni Shoua <monis@mellanox.com>
> > L: linux-rdma@vger.kernel.org
> > diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
> > index e280c8e..b7ab144 100644
> > --- a/drivers/i2c/muxes/Kconfig
> > +++ b/drivers/i2c/muxes/Kconfig
> > @@ -81,4 +81,15 @@ config I2C_DEMUX_PINCTRL
> > demultiplexer that uses the pinctrl subsystem. This is useful if you
> > want to change the I2C master at run-time depending on features.
> >
> > +config I2C_MUX_MLXCPLD
> > + tristate "Mellanox CPLD based I2C multiplexer"
> > + help
> > + If you say yes to this option, support will be included for a
> > + CPLD based I2C multiplexer. This driver provides access to
> > + I2C busses connected through a MUX, which is controlled
> > + by a CPLD registers.
>
> s/registers/register/
>
> > +
> > + This driver can also be built as a module. If so, the module
> > + will be called i2c-mux-mlxcpld.
> > +
> > endmenu
> > diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
> > index 7c267c2..e5c990e 100644
> > --- a/drivers/i2c/muxes/Makefile
> > +++ b/drivers/i2c/muxes/Makefile
> > @@ -10,5 +10,6 @@ obj-$(CONFIG_I2C_MUX_PCA9541) += i2c-mux-
> pca9541.o
> > obj-$(CONFIG_I2C_MUX_PCA954x) += i2c-mux-pca954x.o
> > obj-$(CONFIG_I2C_MUX_PINCTRL) += i2c-mux-pinctrl.o
> > obj-$(CONFIG_I2C_MUX_REG) += i2c-mux-reg.o
> > +obj-$(CONFIG_I2C_MUX_MLXCPLD) += i2c-mux-mlxcpld.o
>
> Please keep these lines sorted too.
>
> >
> > ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG diff --git
> > a/drivers/i2c/muxes/i2c-mux-mlxcpld.c
> > b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
> > new file mode 100644
> > index 0000000..08d3b1a
> > --- /dev/null
> > +++ b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
> > @@ -0,0 +1,224 @@
> > +/*
> > + * drivers/i2c/muxes/i2c-mux-mlxcpld.c
> > + * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
> > + * Copyright (c) 2016 Michael Shych <michaels@mellanox.com>
> > + *
> > + * Redistribution and use in source and binary forms, with or without
> > + * modification, are permitted provided that the following conditions are
> met:
> > + *
> > + * 1. Redistributions of source code must retain the above copyright
> > + * notice, this list of conditions and the following disclaimer.
> > + * 2. Redistributions in binary form must reproduce the above copyright
> > + * notice, this list of conditions and the following disclaimer in the
> > + * documentation and/or other materials provided with the distribution.
> > + * 3. Neither the names of the copyright holders nor the names of its
> > + * contributors may be used to endorse or promote products derived from
> > + * this software without specific prior written permission.
> > + *
> > + * Alternatively, this software may be distributed under the terms of
> > +the
> > + * GNU General Public License ("GPL") version 2 as published by the
> > +Free
> > + * Software Foundation.
> > + *
> > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS "AS IS"
> > + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> LIMITED
> > +TO, THE
> > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> PARTICULAR
> > +PURPOSE
> > + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
> > +CONTRIBUTORS BE
> > + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
> > +OR
> > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
> PROCUREMENT
> > +OF
> > + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
> > +BUSINESS
> > + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> > +WHETHER IN
> > + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> > +OTHERWISE)
> > + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> > +ADVISED OF THE
> > + * POSSIBILITY OF SUCH DAMAGE.
> > + */
> > +
> > +#include <linux/device.h>
> > +#include <linux/i2c.h>
> > +#include <linux/i2c-mux.h>
> > +#include <linux/io.h>
> > +#include <linux/init.h>
> > +#include <linux/module.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/slab.h>
> > +#include <linux/version.h>
> > +#include <linux/i2c/mlxcpld.h>
> > +
> > +#define CPLD_MUX_MAX_NCHANS 8
> > +
> > +/* mlxcpld_mux - mux control structure:
> > + * @last_chan - last register value
> > + * @client - I2C device client
> > + */
> > +struct mlxcpld_mux {
> > + u8 last_chan;
> > + struct i2c_client *client;
> > +};
> > +
> > +/* MUX logic description.
> > + * Driver can support different mux control logic, according to CPLD
> > + * implementation.
> > + *
> > + * Connectivity schema.
> > + *
> > + * i2c-mlxcpld Digital Analog
> > + * driver
> > + * *--------* * -> mux1 (virt bus2) -> mux -> |
> > + * | I2CLPC | i2c physical * -> mux2 (virt bus3) -> mux -> |
> > + * | bridge | bus 1 *---------* |
> > + * | logic |---------------------> * mux reg * |
> > + * | in CPLD| *---------* |
> > + * *--------* i2c-mux-mlxpcld ^ * -> muxn (virt busn) -> mux -> |
> > + * | driver | |
> > + * | *---------------* | Devices
> > + * | * CPLD (i2c bus)* select |
> > + * | * registers for *--------*
> > + * | * mux selection * deselect
> > + * | *---------------*
> > + * | |
> > + * <--------> <----------->
> > + * i2c cntrl Board cntrl reg
> > + * reg space space (mux select,
> > + * IO, LED, WD, info)
> > + *
> > + */
> > +
> > +static const struct i2c_device_id mlxcpld_mux_id[] = {
> > + { "mlxcpld_mux_module", 0 },
> > + { }
> > +};
> > +MODULE_DEVICE_TABLE(i2c, mlxcpld_mux_id);
> > +
> > +/* Write to mux register. Don't use i2c_transfer() and
> > + * i2c_smbus_xfer() for this as they will try to lock adapter a
> > +second time */
>
> This comment has a strange shortish first line that disturbs me, and you are
> missing the ending period.
>
> /* Write to mux register. Don't use i2c_transfer() and i2c_smbus_xfer()
> * for this as they will try to lock adapter a second time.
> */
>
> > +static int mlxcpld_mux_reg_write(struct i2c_adapter *adap,
> > + struct i2c_client *client, u8 val) {
> > + struct mlxcpld_mux_plat_data *pdata =
> > +dev_get_platdata(&client->dev);
> > +
> > + if (adap->algo->master_xfer) {
> > + struct i2c_msg msg;
> > + u8 msgbuf[] = {pdata->sel_reg_addr, val};
> > +
> > + msg.addr = client->addr;
> > + msg.flags = 0;
> > + msg.len = 2;
> > + msg.buf = msgbuf;
> > + return __i2c_transfer(adap, &msg, 1);
> > + } else if (adap->algo->smbus_xfer) {
> > + union i2c_smbus_data data;
> > +
> > + data.byte = val;
> > + return adap->algo->smbus_xfer(adap, client->addr,
> > + client->flags, I2C_SMBUS_WRITE,
> > + pdata->sel_reg_addr,
> > + I2C_SMBUS_BYTE_DATA, &data);
> > + } else
> > + return -ENODEV;
> > +}
> > +
> > +static int mlxcpld_mux_select_chan(struct i2c_mux_core *muxc, u32
> > +chan) {
> > + struct mlxcpld_mux *data = i2c_mux_priv(muxc);
> > + struct i2c_client *client = data->client;
> > + u8 regval = chan + 1;
> > + int err = 0;
> > +
> > + /* Only select the channel if its different from the last channel */
> > + if (data->last_chan != regval) {
> > + err = mlxcpld_mux_reg_write(muxc->parent, client, regval);
> > + if (err)
> > + data->last_chan = 0;
> > + else
> > + data->last_chan = regval;
> > + }
> > +
> > + return err;
> > +}
> > +
> > +static int mlxcpld_mux_deselect(struct i2c_mux_core *muxc, u32 chan)
> > +{
> > + struct mlxcpld_mux *data = i2c_mux_priv(muxc);
> > + struct i2c_client *client = data->client;
> > +
> > + /* Deselect active channel */
> > + data->last_chan = 0;
> > +
> > + return mlxcpld_mux_reg_write(muxc->parent, client, data->last_chan);
> > +}
> > +
> > +/* I2C init/probing/exit functions */ static int
> > +mlxcpld_mux_probe(struct i2c_client *client,
> > + const struct i2c_device_id *id) {
> > + struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
> > + struct mlxcpld_mux_plat_data *pdata = dev_get_platdata(&client-
> >dev);
> > + struct i2c_mux_core *muxc;
> > + int num, force;
> > + struct mlxcpld_mux *data;
> > + int err;
> > +
> > + if (!pdata)
> > + return -EINVAL;
> > +
> > + if (!i2c_check_functionality(adap,
> I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
> > + return -ENODEV;
> > +
> > + muxc = i2c_mux_alloc(adap, &client->dev, CPLD_MUX_MAX_NCHANS,
> > + sizeof(*data), 0, mlxcpld_mux_select_chan,
> > + mlxcpld_mux_deselect);
> > + if (!muxc)
> > + return -ENOMEM;
> > +
> > + data = i2c_mux_priv(muxc);
> > + i2c_set_clientdata(client, muxc);
> > + data->client = client;
> > + data->last_chan = 0; /* force the first selection */
> > +
> > + /* Create an adapter for each channel. */
> > + for (num = 0; num < CPLD_MUX_MAX_NCHANS; num++) {
> > + force = 0; /* dynamic adap number */
>
> This assignment can be dropped.
>
> > + if (num >= pdata->num_adaps)
> > + /* discard unconfigured channels */
> > + break;
> > +
> > + force = pdata->adap_ids[num];
> > +
> > + err = i2c_mux_add_adapter(muxc, force, num, 0);
> > + if (err) {
> > + dev_err(&client->dev, "failed to register multiplexed
> adapter %d as bus %d\n",
> > + num, force);
>
> There is generic error messages for all failures inside i2c_mux_add_adapter, so
> this message can be dropped. If the generic messages are not sufficient, please
> expand them instead of adding extra messages.
>
> > + goto virt_reg_failed;
> > + }
> > + }
> > +
> > + return 0;
> > +
> > +virt_reg_failed:
> > + i2c_mux_del_adapters(muxc);
> > + return err;
> > +}
> > +
> > +static int mlxcpld_mux_remove(struct i2c_client *client) {
> > + struct i2c_mux_core *muxc = i2c_get_clientdata(client);
> > +
> > + i2c_mux_del_adapters(muxc);
> > + return 0;
> > +}
> > +
> > +static struct i2c_driver mlxcpld_mux_driver = {
> > + .driver = {
> > + .name = "mlxcpld-mux",
> > + },
> > + .probe = mlxcpld_mux_probe,
> > + .remove = mlxcpld_mux_remove,
> > + .id_table = mlxcpld_mux_id,
> > +};
> > +
> > +module_i2c_driver(mlxcpld_mux_driver);
> > +
> > +MODULE_AUTHOR("Michael Shych (michaels@mellanox.com)");
> > +MODULE_DESCRIPTION("Mellanox I2C-CPLD-MUX driver");
> > +MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:i2c-mux-mlxcpld");
> > diff --git a/include/linux/i2c/mlxcpld.h b/include/linux/i2c/mlxcpld.h
> > new file mode 100644 index 0000000..b08dcb1
> > --- /dev/null
> > +++ b/include/linux/i2c/mlxcpld.h
> > @@ -0,0 +1,52 @@
> > +/*
> > + * mlxcpld.h - Mellanox I2C multiplexer support in CPLD
> > + *
> > + * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
> > + * Copyright (c) 2016 Michael Shych <michaels@mellanox.com>
> > + *
> > + * Redistribution and use in source and binary forms, with or without
> > + * modification, are permitted provided that the following conditions are
> met:
> > + *
> > + * 1. Redistributions of source code must retain the above copyright
> > + * notice, this list of conditions and the following disclaimer.
> > + * 2. Redistributions in binary form must reproduce the above copyright
> > + * notice, this list of conditions and the following disclaimer in the
> > + * documentation and/or other materials provided with the distribution.
> > + * 3. Neither the names of the copyright holders nor the names of its
> > + * contributors may be used to endorse or promote products derived from
> > + * this software without specific prior written permission.
> > + *
> > + * Alternatively, this software may be distributed under the terms of
> > +the
> > + * GNU General Public License ("GPL") version 2 as published by the
> > +Free
> > + * Software Foundation.
> > + *
> > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS "AS IS"
> > + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> LIMITED
> > +TO, THE
> > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> PARTICULAR
> > +PURPOSE
> > + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
> > +CONTRIBUTORS BE
> > + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
> > +OR
> > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
> PROCUREMENT
> > +OF
> > + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
> > +BUSINESS
> > + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> > +WHETHER IN
> > + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> > +OTHERWISE)
> > + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> > +ADVISED OF THE
> > + * POSSIBILITY OF SUCH DAMAGE.
> > + */
> > +
> > +#ifndef _LINUX_I2C_MLXCPLD_H
> > +#define _LINUX_I2C_MLXCPLD_H
> > +
> > +/* Platform data for the CPLD I2C multiplexers */
> > +
> > +/* mlxcpld_mux_plat_data - per mux data, used with
> > +i2c_register_board_info
> > + * @adap_ids - adapter array
> > + * @num_adaps - number of adapters
> > + * @sel_reg_addr - mux select register offset in CPLD space */
> > +struct mlxcpld_mux_plat_data {
> > + int *adap_ids;
> > + int num_adaps;
> > + int sel_reg_addr;
> > +};
> > +
> > +#endif /* _LINUX_I2C_MLXCPLD_H */
> >
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox