| Message ID | 1477898553-61392-1-git-send-email-vadimp@mellanox.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Andy Shevchenko |
| Headers | show |
On Mon, 31 Oct 2016, Vadim Pasternak wrote: > Since mlx-platform is not an architectural driver, it is moved out > of arch/x86/platform to drivers/platform/x86. > Relevant Makefile and Kconfig are updated. > > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, Could this patch be merged to for-next for 4.10? When it's merged I'd like to submit another small patch on top of it. Thanks, Vadim. > -----Original Message----- > From: Thomas Gleixner [mailto:tglx@linutronix.de] > Sent: Monday, October 31, 2016 5:31 PM > To: Vadim Pasternak <vadimp@mellanox.com> > Cc: dvhart@infradead.org; platform-driver-x86@vger.kernel.org; > x86@kernel.org; linux-kernel@vger.kernel.org; jiri@resnulli.us; > andriy.shevchenko@linux.intel.com > Subject: Re: [patch v3 1/1] platform/x86: move module mlx-platform from > arch/x86 to drivers/platform/x86 > > On Mon, 31 Oct 2016, Vadim Pasternak wrote: > > > Since mlx-platform is not an architectural driver, it is moved out of > > arch/x86/platform to drivers/platform/x86. > > Relevant Makefile and Kconfig are updated. > > > > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> > > Acked-by: Thomas Gleixner <tglx@linutronix.de> -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 8, 2016 at 8:19 AM, Vadim Pasternak <vadimp@mellanox.com> wrote: > Hi, > > Could this patch be merged to for-next for 4.10? > When it's merged I'd like to submit another small patch on top of it. First of all, please avoid top posting. I will process the pdx86 mailing list and queue this week. P.S. Are you sure that is the right fix "Remove "select MLX_PLATFORM" from Kconfig, since it has unmet direct dependencies (X86 && X86_PLATFORM_DEVICES && X86_64)"? >> On Mon, 31 Oct 2016, Vadim Pasternak wrote: >> >> > Since mlx-platform is not an architectural driver, it is moved out of >> > arch/x86/platform to drivers/platform/x86. >> > Relevant Makefile and Kconfig are updated. >> > >> > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> >> >> Acked-by: Thomas Gleixner <tglx@linutronix.de>
> -----Original Message----- > From: Andy Shevchenko [mailto:andy.shevchenko@gmail.com] > Sent: Monday, November 14, 2016 9:17 AM > To: Vadim Pasternak <vadimp@mellanox.com> > Cc: Thomas Gleixner <tglx@linutronix.de>; dvhart@infradead.org; platform- > driver-x86@vger.kernel.org; x86@kernel.org; linux-kernel@vger.kernel.org; > jiri@resnulli.us; andriy.shevchenko@linux.intel.com > Subject: Re: [patch v3 1/1] platform/x86: move module mlx-platform from > arch/x86 to drivers/platform/x86 > > On Tue, Nov 8, 2016 at 8:19 AM, Vadim Pasternak <vadimp@mellanox.com> > wrote: > > Hi, > > > > Could this patch be merged to for-next for 4.10? > > When it's merged I'd like to submit another small patch on top of it. > Hi Andy, Thanks for reply. > First of all, please avoid top posting. Sorry for that. I posted on top, because it doesn't come as reply to something (but it seems I should post at bottom in suc case). > I will process the pdx86 mailing list and queue this week. > > P.S. Are you sure that is the right fix "Remove "select MLX_PLATFORM" > from Kconfig, since it has unmet direct dependencies (X86 && > X86_PLATFORM_DEVICES && X86_64)"? There were two possibility: to leave "select MLX_PLATFORM" and add " depends on X86_64". Or just remove select. I decide to remove, having in mind the next considerations: If MLX_PLATFORM is not selected here - just nobody will activate hotplug driver; If in the feature on some systems we'll have ACPI support - hotplug still is relevant. > > >> On Mon, 31 Oct 2016, Vadim Pasternak wrote: > >> > >> > Since mlx-platform is not an architectural driver, it is moved out > >> > of arch/x86/platform to drivers/platform/x86. > >> > Relevant Makefile and Kconfig are updated. > >> > > >> > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> > >> > >> Acked-by: Thomas Gleixner <tglx@linutronix.de> > > -- > With Best Regards, > Andy Shevchenko
DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogVmFkaW0gUGFzdGVybmFr DQo+IFNlbnQ6IE1vbmRheSwgTm92ZW1iZXIgMTQsIDIwMTYgMTA6MTAgQU0NCj4gVG86ICdBbmR5 IFNoZXZjaGVua28nIDxhbmR5LnNoZXZjaGVua29AZ21haWwuY29tPg0KPiBDYzogVGhvbWFzIEds ZWl4bmVyIDx0Z2x4QGxpbnV0cm9uaXguZGU+OyBkdmhhcnRAaW5mcmFkZWFkLm9yZzsgcGxhdGZv cm0tDQo+IGRyaXZlci14ODZAdmdlci5rZXJuZWwub3JnOyB4ODZAa2VybmVsLm9yZzsgbGludXgt a2VybmVsQHZnZXIua2VybmVsLm9yZzsNCj4gamlyaUByZXNudWxsaS51czsgYW5kcml5LnNoZXZj aGVua29AbGludXguaW50ZWwuY29tDQo+IFN1YmplY3Q6IFJFOiBbcGF0Y2ggdjMgMS8xXSBwbGF0 Zm9ybS94ODY6IG1vdmUgbW9kdWxlIG1seC1wbGF0Zm9ybSBmcm9tDQo+IGFyY2gveDg2IHRvIGRy aXZlcnMvcGxhdGZvcm0veDg2DQo+IA0KPiANCj4gDQo+ID4gLS0tLS1PcmlnaW5hbCBNZXNzYWdl LS0tLS0NCj4gPiBGcm9tOiBBbmR5IFNoZXZjaGVua28gW21haWx0bzphbmR5LnNoZXZjaGVua29A Z21haWwuY29tXQ0KPiA+IFNlbnQ6IE1vbmRheSwgTm92ZW1iZXIgMTQsIDIwMTYgOToxNyBBTQ0K PiA+IFRvOiBWYWRpbSBQYXN0ZXJuYWsgPHZhZGltcEBtZWxsYW5veC5jb20+DQo+ID4gQ2M6IFRo b21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPjsgZHZoYXJ0QGluZnJhZGVhZC5vcmc7 DQo+ID4gcGxhdGZvcm0tIGRyaXZlci14ODZAdmdlci5rZXJuZWwub3JnOyB4ODZAa2VybmVsLm9y ZzsNCj4gPiBsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnOyBqaXJpQHJlc251bGxpLnVzOw0K PiA+IGFuZHJpeS5zaGV2Y2hlbmtvQGxpbnV4LmludGVsLmNvbQ0KPiA+IFN1YmplY3Q6IFJlOiBb cGF0Y2ggdjMgMS8xXSBwbGF0Zm9ybS94ODY6IG1vdmUgbW9kdWxlIG1seC1wbGF0Zm9ybQ0KPiA+ IGZyb20NCj4gPiBhcmNoL3g4NiB0byBkcml2ZXJzL3BsYXRmb3JtL3g4Ng0KPiA+DQo+ID4gT24g VHVlLCBOb3YgOCwgMjAxNiBhdCA4OjE5IEFNLCBWYWRpbSBQYXN0ZXJuYWsgPHZhZGltcEBtZWxs YW5veC5jb20+DQo+ID4gd3JvdGU6DQo+ID4gPiBIaSwNCj4gPiA+DQo+ID4gPiBDb3VsZCB0aGlz IHBhdGNoIGJlIG1lcmdlZCB0byBmb3ItbmV4dCBmb3IgNC4xMD8NCj4gPiA+IFdoZW4gaXQncyBt ZXJnZWQgSSdkIGxpa2UgdG8gc3VibWl0IGFub3RoZXIgc21hbGwgcGF0Y2ggb24gdG9wIG9mIGl0 Lg0KPiA+DQo+IA0KPiBIaSBBbmR5LA0KPiBUaGFua3MgZm9yIHJlcGx5Lg0KPiANCj4gPiBGaXJz dCBvZiBhbGwsIHBsZWFzZSBhdm9pZCB0b3AgcG9zdGluZy4NCj4gDQo+IFNvcnJ5IGZvciB0aGF0 Lg0KPiBJIHBvc3RlZCBvbiB0b3AsIGJlY2F1c2UgaXQgZG9lc24ndCBjb21lIGFzIHJlcGx5IHRv IHNvbWV0aGluZyAoYnV0IGl0IHNlZW1zIEkNCj4gc2hvdWxkIHBvc3QgYXQgYm90dG9tIGluIHN1 YyBjYXNlKS4NCj4gDQo+ID4gSSB3aWxsIHByb2Nlc3MgdGhlIHBkeDg2IG1haWxpbmcgbGlzdCBh bmQgcXVldWUgdGhpcyB3ZWVrLg0KDQpJIGFtIHZlcnkgc29ycnkgZm9yIHJlbWluZGluZywgYnV0 IEkgc2VlIHRoYXQgaXQncyBzdGlsbCBub3QgbWVyZ2VkLg0KDQpUaGFua3MsDQpWYWRpbS4NCg0K PiA+DQo+ID4gUC5TLiBBcmUgeW91IHN1cmUgdGhhdCBpcyB0aGUgcmlnaHQgZml4ICJSZW1vdmUg InNlbGVjdCBNTFhfUExBVEZPUk0iDQo+ID4gZnJvbSBLY29uZmlnLCBzaW5jZSBpdCBoYXMgdW5t ZXQgZGlyZWN0IGRlcGVuZGVuY2llcyAoWDg2ICYmDQo+ID4gWDg2X1BMQVRGT1JNX0RFVklDRVMg JiYgWDg2XzY0KSI/DQo+IA0KPiBUaGVyZSB3ZXJlIHR3byBwb3NzaWJpbGl0eTogdG8gbGVhdmUg InNlbGVjdCBNTFhfUExBVEZPUk0iIGFuZCBhZGQgIiBkZXBlbmRzDQo+IG9uIFg4Nl82NCIuIE9y IGp1c3QgcmVtb3ZlIHNlbGVjdC4NCj4gSSBkZWNpZGUgdG8gcmVtb3ZlLCBoYXZpbmcgaW4gbWlu ZCB0aGUgbmV4dCBjb25zaWRlcmF0aW9uczoNCj4gSWYgTUxYX1BMQVRGT1JNIGlzIG5vdCBzZWxl Y3RlZCBoZXJlIC0ganVzdCBub2JvZHkgd2lsbCBhY3RpdmF0ZSBob3RwbHVnIGRyaXZlcjsNCj4g SWYgaW4gdGhlIGZlYXR1cmUgb24gc29tZSBzeXN0ZW1zIHdlJ2xsIGhhdmUgQUNQSSBzdXBwb3J0 IC0gaG90cGx1ZyBzdGlsbCBpcw0KPiByZWxldmFudC4NCj4gDQo+ID4NCj4gPiA+PiBPbiBNb24s IDMxIE9jdCAyMDE2LCBWYWRpbSBQYXN0ZXJuYWsgd3JvdGU6DQo+ID4gPj4NCj4gPiA+PiA+IFNp bmNlIG1seC1wbGF0Zm9ybSBpcyBub3QgYW4gYXJjaGl0ZWN0dXJhbCBkcml2ZXIsIGl0IGlzIG1v dmVkDQo+ID4gPj4gPiBvdXQgb2YgYXJjaC94ODYvcGxhdGZvcm0gdG8gZHJpdmVycy9wbGF0Zm9y bS94ODYuDQo+ID4gPj4gPiBSZWxldmFudCBNYWtlZmlsZSBhbmQgS2NvbmZpZyBhcmUgdXBkYXRl ZC4NCj4gPiA+PiA+DQo+ID4gPj4gPiBTaWduZWQtb2ZmLWJ5OiBWYWRpbSBQYXN0ZXJuYWsgPHZh ZGltcEBtZWxsYW5veC5jb20+DQo+ID4gPj4NCj4gPiA+PiBBY2tlZC1ieTogVGhvbWFzIEdsZWl4 bmVyIDx0Z2x4QGxpbnV0cm9uaXguZGU+DQo+ID4NCj4gPiAtLQ0KPiA+IFdpdGggQmVzdCBSZWdh cmRzLA0KPiA+IEFuZHkgU2hldmNoZW5rbw0K -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Nov 25, 2016 at 6:14 AM, Vadim Pasternak <vadimp@mellanox.com> wrote: >> Thanks for reply. >> >> > First of all, please avoid top posting. >> >> Sorry for that. >> I posted on top, because it doesn't come as reply to something (but it seems I >> should post at bottom in suc case). >> >> > I will process the pdx86 mailing list and queue this week. > > I am very sorry for reminding, but I see that it's still not merged. Sorry for that, we encounter one issue with repository permissions, so, currently I can't do much. We are trying to resolve this as soon as possible. We still have time before merge window (one week or so).
> -----Original Message----- > From: Andy Shevchenko [mailto:andy.shevchenko@gmail.com] > Sent: Friday, November 25, 2016 12:03 PM > To: Vadim Pasternak <vadimp@mellanox.com> > Cc: Thomas Gleixner <tglx@linutronix.de>; dvhart@infradead.org; platform- > driver-x86@vger.kernel.org; x86@kernel.org; linux-kernel@vger.kernel.org; > jiri@resnulli.us; andriy.shevchenko@linux.intel.com > Subject: Re: [patch v3 1/1] platform/x86: move module mlx-platform from > arch/x86 to drivers/platform/x86 > > On Fri, Nov 25, 2016 at 6:14 AM, Vadim Pasternak <vadimp@mellanox.com> > wrote: > >> Thanks for reply. > >> > >> > First of all, please avoid top posting. > >> > >> Sorry for that. > >> I posted on top, because it doesn't come as reply to something (but > >> it seems I should post at bottom in suc case). > >> > >> > I will process the pdx86 mailing list and queue this week. > > > > I am very sorry for reminding, but I see that it's still not merged. > > > Sorry for that, we encounter one issue with repository permissions, so, currently > I can't do much. We are trying to resolve this as soon as possible. > We still have time before merge window (one week or so). > Hi Andy, OK, I see. I just have another patch, you already made review for that. And I am waiting for the merge, in order to send this patch (this is the change in mlx-platform.c module, which is going to migrate). And I am afraid I can missed merge window for it. Thanks, Vadim. > -- > With Best Regards, > Andy Shevchenko
On Mon, Oct 31, 2016 at 9:22 AM, Vadim Pasternak <vadimp@mellanox.com> wrote: > Since mlx-platform is not an architectural driver, it is moved out > of arch/x86/platform to drivers/platform/x86. > Relevant Makefile and Kconfig are updated. Pushed to testing with fixed Subject (Pattern is "platform/x86: driver: Description"). Thanks. > > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> > --- > v2->v3: > Comments pointed out by Andy: > - Remove "driver" prefix from the subject; > - Change subject content; > - Reduce CC list; > - Put patch history exactly after '---' marker; > - Remove reference to module name from module header; > - Explain changes in Kconfig: > remove "depends on MLX_PLATFORM", since it has default n and this line > is not needed; > Fixes added by Vadim: > - Remove "select MLX_PLATFORM" from Kconfig, since it has unmet direct > dependencies (X86 && X86_PLATFORM_DEVICES && X86_64); > v1->v2: > Comments pointed out by Andy: > - Use -M -C -n option in git format-patch; > --- > MAINTAINERS | 2 +- > arch/x86/Kconfig | 12 ------------ > arch/x86/platform/Makefile | 1 - > arch/x86/platform/mellanox/Makefile | 1 - > drivers/platform/x86/Kconfig | 13 ++++++++++++- > drivers/platform/x86/Makefile | 1 + > .../mellanox => drivers/platform/x86}/mlx-platform.c | 1 - > 7 files changed, 14 insertions(+), 17 deletions(-) > delete mode 100644 arch/x86/platform/mellanox/Makefile > rename {arch/x86/platform/mellanox => drivers/platform/x86}/mlx-platform.c (99%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 3e30399..960f364f 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -7879,7 +7879,7 @@ MELLANOX PLATFORM DRIVER > M: Vadim Pasternak <vadimp@mellanox.com> > L: platform-driver-x86@vger.kernel.org > S: Supported > -F: arch/x86/platform/mellanox/mlx-platform.c > +F: drivers/platform/x86/mlx-platform.c > > MELLANOX MLX CPLD HOTPLUG DRIVER > M: Vadim Pasternak <vadimp@mellanox.com> > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index bada636..ccd5ff7 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -550,18 +550,6 @@ config X86_INTEL_QUARK > Say Y here if you have a Quark based system such as the Arduino > compatible Intel Galileo. > > -config MLX_PLATFORM > - tristate "Mellanox Technologies platform support" > - depends on X86_64 > - depends on X86_EXTENDED_PLATFORM > - ---help--- > - This option enables system support for the Mellanox Technologies > - platform. > - > - Say Y here if you are building a kernel for Mellanox system. > - > - Otherwise, say N. > - > config X86_INTEL_LPSS > bool "Intel Low Power Subsystem Support" > depends on X86 && ACPI > diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile > index 3c3c19e..184842e 100644 > --- a/arch/x86/platform/Makefile > +++ b/arch/x86/platform/Makefile > @@ -8,7 +8,6 @@ obj-y += iris/ > obj-y += intel/ > obj-y += intel-mid/ > obj-y += intel-quark/ > -obj-y += mellanox/ > obj-y += olpc/ > obj-y += scx200/ > obj-y += sfi/ > diff --git a/arch/x86/platform/mellanox/Makefile b/arch/x86/platform/mellanox/Makefile > deleted file mode 100644 > index f43c931..0000000 > --- a/arch/x86/platform/mellanox/Makefile > +++ /dev/null > @@ -1 +0,0 @@ > -obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > index 1853769..4639d97 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -1028,10 +1028,21 @@ config INTEL_TELEMETRY > directly via debugfs files. Various tools may use > this interface for SoC state monitoring. > > +config MLX_PLATFORM > + tristate "Mellanox Technologies platform support" > + depends on X86_64 > + ---help--- > + This option enables system support for the Mellanox Technologies > + platform. The Mellanox systems provide data center networking > + solutions based on Virtual Protocol Interconnect (VPI) technology > + enable seamless connectivity to 56/100Gb/s InfiniBand or 10/40/56GbE > + connection. > + > + If you have a Mellanox system, say Y or M here. > + > config MLX_CPLD_PLATFORM > tristate "Mellanox platform hotplug driver support" > default n > - depends on MLX_PLATFORM > select HWMON > select I2C > ---help--- > diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile > index 1f06b63..2d6a587 100644 > --- a/drivers/platform/x86/Makefile > +++ b/drivers/platform/x86/Makefile > @@ -71,4 +71,5 @@ obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \ > intel_telemetry_pltdrv.o \ > intel_telemetry_debugfs.o > obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o > +obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o > obj-$(CONFIG_MLX_CPLD_PLATFORM) += mlxcpld-hotplug.o > diff --git a/arch/x86/platform/mellanox/mlx-platform.c b/drivers/platform/x86/mlx-platform.c > similarity index 99% > rename from arch/x86/platform/mellanox/mlx-platform.c > rename to drivers/platform/x86/mlx-platform.c > index 7dcfcca..bbf60d1 100644 > --- a/arch/x86/platform/mellanox/mlx-platform.c > +++ b/drivers/platform/x86/mlx-platform.c > @@ -1,5 +1,4 @@ > /* > - * arch/x86/platform/mellanox/mlx-platform.c > * Copyright (c) 2016 Mellanox Technologies. All rights reserved. > * Copyright (c) 2016 Vadim Pasternak <vadimp@mellanox.com> > * > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/MAINTAINERS b/MAINTAINERS index 3e30399..960f364f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7879,7 +7879,7 @@ MELLANOX PLATFORM DRIVER M: Vadim Pasternak <vadimp@mellanox.com> L: platform-driver-x86@vger.kernel.org S: Supported -F: arch/x86/platform/mellanox/mlx-platform.c +F: drivers/platform/x86/mlx-platform.c MELLANOX MLX CPLD HOTPLUG DRIVER M: Vadim Pasternak <vadimp@mellanox.com> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index bada636..ccd5ff7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -550,18 +550,6 @@ config X86_INTEL_QUARK Say Y here if you have a Quark based system such as the Arduino compatible Intel Galileo. -config MLX_PLATFORM - tristate "Mellanox Technologies platform support" - depends on X86_64 - depends on X86_EXTENDED_PLATFORM - ---help--- - This option enables system support for the Mellanox Technologies - platform. - - Say Y here if you are building a kernel for Mellanox system. - - Otherwise, say N. - config X86_INTEL_LPSS bool "Intel Low Power Subsystem Support" depends on X86 && ACPI diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index 3c3c19e..184842e 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile @@ -8,7 +8,6 @@ obj-y += iris/ obj-y += intel/ obj-y += intel-mid/ obj-y += intel-quark/ -obj-y += mellanox/ obj-y += olpc/ obj-y += scx200/ obj-y += sfi/ diff --git a/arch/x86/platform/mellanox/Makefile b/arch/x86/platform/mellanox/Makefile deleted file mode 100644 index f43c931..0000000 --- a/arch/x86/platform/mellanox/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 1853769..4639d97 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1028,10 +1028,21 @@ config INTEL_TELEMETRY directly via debugfs files. Various tools may use this interface for SoC state monitoring. +config MLX_PLATFORM + tristate "Mellanox Technologies platform support" + depends on X86_64 + ---help--- + This option enables system support for the Mellanox Technologies + platform. The Mellanox systems provide data center networking + solutions based on Virtual Protocol Interconnect (VPI) technology + enable seamless connectivity to 56/100Gb/s InfiniBand or 10/40/56GbE + connection. + + If you have a Mellanox system, say Y or M here. + config MLX_CPLD_PLATFORM tristate "Mellanox platform hotplug driver support" default n - depends on MLX_PLATFORM select HWMON select I2C ---help--- diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 1f06b63..2d6a587 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -71,4 +71,5 @@ obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \ intel_telemetry_pltdrv.o \ intel_telemetry_debugfs.o obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o +obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o obj-$(CONFIG_MLX_CPLD_PLATFORM) += mlxcpld-hotplug.o diff --git a/arch/x86/platform/mellanox/mlx-platform.c b/drivers/platform/x86/mlx-platform.c similarity index 99% rename from arch/x86/platform/mellanox/mlx-platform.c rename to drivers/platform/x86/mlx-platform.c index 7dcfcca..bbf60d1 100644 --- a/arch/x86/platform/mellanox/mlx-platform.c +++ b/drivers/platform/x86/mlx-platform.c @@ -1,5 +1,4 @@ /* - * arch/x86/platform/mellanox/mlx-platform.c * Copyright (c) 2016 Mellanox Technologies. All rights reserved. * Copyright (c) 2016 Vadim Pasternak <vadimp@mellanox.com> *
Since mlx-platform is not an architectural driver, it is moved out of arch/x86/platform to drivers/platform/x86. Relevant Makefile and Kconfig are updated. Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> --- v2->v3: Comments pointed out by Andy: - Remove "driver" prefix from the subject; - Change subject content; - Reduce CC list; - Put patch history exactly after '---' marker; - Remove reference to module name from module header; - Explain changes in Kconfig: remove "depends on MLX_PLATFORM", since it has default n and this line is not needed; Fixes added by Vadim: - Remove "select MLX_PLATFORM" from Kconfig, since it has unmet direct dependencies (X86 && X86_PLATFORM_DEVICES && X86_64); v1->v2: Comments pointed out by Andy: - Use -M -C -n option in git format-patch; --- MAINTAINERS | 2 +- arch/x86/Kconfig | 12 ------------ arch/x86/platform/Makefile | 1 - arch/x86/platform/mellanox/Makefile | 1 - drivers/platform/x86/Kconfig | 13 ++++++++++++- drivers/platform/x86/Makefile | 1 + .../mellanox => drivers/platform/x86}/mlx-platform.c | 1 - 7 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 arch/x86/platform/mellanox/Makefile rename {arch/x86/platform/mellanox => drivers/platform/x86}/mlx-platform.c (99%)