* [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard [not found] <cover.1372211451.git.dvhart@linux.intel.com> @ 2013-06-26 1:53 ` Darren Hart 2013-06-26 2:31 ` Greg Kroah-Hartman 0 siblings, 1 reply; 10+ messages in thread From: Darren Hart @ 2013-06-26 1:53 UTC (permalink / raw) To: Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, dvhart Cc: Greg Kroah-Hartman, Jiri Slaby, linux-serial Use DMI_BOARD_NAME to determine if we are running on a MinnowBoard and set the uart clock to 50MHz if so. This removes the need to pass the user_uartclk to the kernel at boot time. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jiri Slaby <jslaby@suse.cz> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Peter Waskiewicz <peter.p.waskiewicz.jr@intel.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: linux-serial@vger.kernel.org --- drivers/tty/serial/pch_uart.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 21a7e17..572d481 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c @@ -217,6 +217,7 @@ enum { #define FRI2_64_UARTCLK 64000000 /* 64.0000 MHz */ #define FRI2_48_UARTCLK 48000000 /* 48.0000 MHz */ #define NTC1_UARTCLK 64000000 /* 64.0000 MHz */ +#define MINNOW_UARTCLK 50000000 /* 50.0000 MHz */ struct pch_uart_buffer { unsigned char *buf; @@ -398,6 +399,10 @@ static int pch_uart_get_uartclk(void) strstr(cmp, "nanoETXexpress-TT"))) return NTC1_UARTCLK; + cmp = dmi_get_system_info(DMI_BOARD_NAME); + if (cmp && strstr(cmp, "MinnowBoard")) + return MINNOW_UARTCLK; + return DEFAULT_UARTCLK; } -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard 2013-06-26 1:53 ` [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard Darren Hart @ 2013-06-26 2:31 ` Greg Kroah-Hartman 2013-06-26 3:16 ` Darren Hart 0 siblings, 1 reply; 10+ messages in thread From: Greg Kroah-Hartman @ 2013-06-26 2:31 UTC (permalink / raw) To: Darren Hart Cc: Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, Jiri Slaby, linux-serial On Tue, Jun 25, 2013 at 06:53:22PM -0700, Darren Hart wrote: > Use DMI_BOARD_NAME to determine if we are running on a MinnowBoard and > set the uart clock to 50MHz if so. This removes the need to pass the > user_uartclk to the kernel at boot time. > > Signed-off-by: Darren Hart <dvhart@linux.intel.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Jiri Slaby <jslaby@suse.cz> > Cc: "H. Peter Anvin" <hpa@zytor.com> > Cc: Peter Waskiewicz <peter.p.waskiewicz.jr@intel.com> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: linux-serial@vger.kernel.org > --- > drivers/tty/serial/pch_uart.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c > index 21a7e17..572d481 100644 > --- a/drivers/tty/serial/pch_uart.c > +++ b/drivers/tty/serial/pch_uart.c > @@ -217,6 +217,7 @@ enum { > #define FRI2_64_UARTCLK 64000000 /* 64.0000 MHz */ > #define FRI2_48_UARTCLK 48000000 /* 48.0000 MHz */ > #define NTC1_UARTCLK 64000000 /* 64.0000 MHz */ > +#define MINNOW_UARTCLK 50000000 /* 50.0000 MHz */ > > struct pch_uart_buffer { > unsigned char *buf; > @@ -398,6 +399,10 @@ static int pch_uart_get_uartclk(void) > strstr(cmp, "nanoETXexpress-TT"))) > return NTC1_UARTCLK; > > + cmp = dmi_get_system_info(DMI_BOARD_NAME); > + if (cmp && strstr(cmp, "MinnowBoard")) > + return MINNOW_UARTCLK; > + You know, we do have the DMI interface to handle this in a much nicer way instead of just randomly trying different strings over and over until we find one that matches... greg k-h ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard 2013-06-26 2:31 ` Greg Kroah-Hartman @ 2013-06-26 3:16 ` Darren Hart 2013-06-26 3:39 ` Greg Kroah-Hartman 0 siblings, 1 reply; 10+ messages in thread From: Darren Hart @ 2013-06-26 3:16 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, Jiri Slaby, linux-serial On Tue, 2013-06-25 at 19:31 -0700, Greg Kroah-Hartman wrote: > On Tue, Jun 25, 2013 at 06:53:22PM -0700, Darren Hart wrote: > > > struct pch_uart_buffer { > > unsigned char *buf; > > @@ -398,6 +399,10 @@ static int pch_uart_get_uartclk(void) > > strstr(cmp, "nanoETXexpress-TT"))) > > return NTC1_UARTCLK; > > > > + cmp = dmi_get_system_info(DMI_BOARD_NAME); > > + if (cmp && strstr(cmp, "MinnowBoard")) > > + return MINNOW_UARTCLK; > > + > > You know, we do have the DMI interface to handle this in a much nicer > way instead of just randomly trying different strings over and over > until we find one that matches... I was aiming for minimal change. Partly because I'm lazy. Partly because I don't have all of the impacted hardware to test. Partly because I wanted to keep it simple so I could push this to 3.8 stable. I can rewrite this detection to use the DMI interface. Would you allow it as a follow-on, to keep the changes to stable minimal? Also, I do have a PCI subsystem ID for this particular board which I could trigger on, but since that mechanism didn't exist in the driver already and the other boards don't do it, I just followed what was already there (yeah, so I wrote most of what was already there... but.... anyway) :-) What do you prefer? Rewrite, then add Minnow, or use this, then rewrite? -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard 2013-06-26 3:16 ` Darren Hart @ 2013-06-26 3:39 ` Greg Kroah-Hartman 2013-06-26 3:58 ` Darren Hart 0 siblings, 1 reply; 10+ messages in thread From: Greg Kroah-Hartman @ 2013-06-26 3:39 UTC (permalink / raw) To: Darren Hart Cc: Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, Jiri Slaby, linux-serial On Tue, Jun 25, 2013 at 08:16:18PM -0700, Darren Hart wrote: > On Tue, 2013-06-25 at 19:31 -0700, Greg Kroah-Hartman wrote: > > On Tue, Jun 25, 2013 at 06:53:22PM -0700, Darren Hart wrote: > > > > > struct pch_uart_buffer { > > > unsigned char *buf; > > > @@ -398,6 +399,10 @@ static int pch_uart_get_uartclk(void) > > > strstr(cmp, "nanoETXexpress-TT"))) > > > return NTC1_UARTCLK; > > > > > > + cmp = dmi_get_system_info(DMI_BOARD_NAME); > > > + if (cmp && strstr(cmp, "MinnowBoard")) > > > + return MINNOW_UARTCLK; > > > + > > > > You know, we do have the DMI interface to handle this in a much nicer > > way instead of just randomly trying different strings over and over > > until we find one that matches... > > I was aiming for minimal change. Partly because I'm lazy. Partly > because I don't have all of the impacted hardware to test. Partly > because I wanted to keep it simple so I could push this to 3.8 stable. Then you should have marked it for the stable tree by putting the proper Cc: in the body of the patch... > I can rewrite this detection to use the DMI interface. Would you allow > it as a follow-on, to keep the changes to stable minimal? > > Also, I do have a PCI subsystem ID for this particular board which I > could trigger on, but since that mechanism didn't exist in the driver > already and the other boards don't do it, I just followed what was > already there (yeah, so I wrote most of what was already there... > but.... anyway) :-) > > What do you prefer? Rewrite, then add Minnow, or use this, then > rewrite? How about this, which makes it easy to backport, then you fix it up properly for 3.12? This comes after my tree is pretty much closed for 3.11, but a simple device id addition like this is acceptable, but I'll not get to it until after 3.11-rc1 is out... thanks, greg k-h ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard 2013-06-26 3:39 ` Greg Kroah-Hartman @ 2013-06-26 3:58 ` Darren Hart 2013-06-26 4:16 ` Greg Kroah-Hartman 2013-06-26 6:43 ` Jiri Slaby 0 siblings, 2 replies; 10+ messages in thread From: Darren Hart @ 2013-06-26 3:58 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, Jiri Slaby, linux-serial On Tue, 2013-06-25 at 20:39 -0700, Greg Kroah-Hartman wrote: > On Tue, Jun 25, 2013 at 08:16:18PM -0700, Darren Hart wrote: > > On Tue, 2013-06-25 at 19:31 -0700, Greg Kroah-Hartman wrote: > > > On Tue, Jun 25, 2013 at 06:53:22PM -0700, Darren Hart wrote: > > > > > > > struct pch_uart_buffer { > > > > unsigned char *buf; > > > > @@ -398,6 +399,10 @@ static int pch_uart_get_uartclk(void) > > > > strstr(cmp, "nanoETXexpress-TT"))) > > > > return NTC1_UARTCLK; > > > > > > > > + cmp = dmi_get_system_info(DMI_BOARD_NAME); > > > > + if (cmp && strstr(cmp, "MinnowBoard")) > > > > + return MINNOW_UARTCLK; > > > > + > > > > > > You know, we do have the DMI interface to handle this in a much nicer > > > way instead of just randomly trying different strings over and over > > > until we find one that matches... > > > > I was aiming for minimal change. Partly because I'm lazy. Partly > > because I don't have all of the impacted hardware to test. Partly > > because I wanted to keep it simple so I could push this to 3.8 stable. > > Then you should have marked it for the stable tree by putting the proper > Cc: in the body of the patch... I had expected there to be some discussion on this series as a whole and didn't want to confuse things... I suppose that was silly as the patch will just whither and die if it never makes it into mainline. Apologies. > > > I can rewrite this detection to use the DMI interface. Would you allow > > it as a follow-on, to keep the changes to stable minimal? > > > > Also, I do have a PCI subsystem ID for this particular board which I > > could trigger on, but since that mechanism didn't exist in the driver > > already and the other boards don't do it, I just followed what was > > already there (yeah, so I wrote most of what was already there... > > but.... anyway) :-) > > > > What do you prefer? Rewrite, then add Minnow, or use this, then > > rewrite? > > How about this, which makes it easy to backport, then you fix it up > properly for 3.12? This comes after my tree is pretty much closed for > 3.11, but a simple device id addition like this is acceptable, but I'll > not get to it until after 3.11-rc1 is out... Sure. So something like this is what you have in mind? Build tested only, I'll include it in V2 with proper testing, but just wanted to make sure we're on the same page while I have your attention: >From 22cb21e2421ffcd439f58843422cff0e2579902f Mon Sep 17 00:00:00 2001 Message-Id: <22cb21e2421ffcd439f58843422cff0e2579902f.1372219079.git.dvhart@linux.intel.com> From: Darren Hart <dvhart@linux.intel.com> Date: Tue, 25 Jun 2013 20:54:29 -0700 Subject: [PATCH] pch_uart: Use DMI interface for board detection Use the DMI interface rather than manually matching DMI strings. Signed-off-by: Darren Hart <dvhart@linux.intel.com> --- drivers/tty/serial/pch_uart.c | 71 +++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 22 deletions(-) diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 572d481..271cc73 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c @@ -373,35 +373,62 @@ static const struct file_operations port_regs_ops = { }; #endif /* CONFIG_DEBUG_FS */ +static struct dmi_system_id __initdata pch_uart_dmi_table[] = { + { + .ident = "CM-iTC", + { + DMI_MATCH(DMI_BOARD_NAME, "CM-iTC"), + }, + (void *)CMITC_UARTCLK, + }, + { + .ident = "FRI2", + { + DMI_MATCH(DMI_BIOS_VERSION, "FRI2"), + }, + (void *)FRI2_64_UARTCLK, + }, + { + .ident = "Fish River Island II", + { + DMI_MATCH(DMI_PRODUCT_NAME, "Fish River Island II"), + }, + (void *)FRI2_48_UARTCLK, + }, + { + .ident = "COMe-mTT", + { + DMI_MATCH(DMI_BOARD_NAME, "COMe-mTT"), + }, + (void *)NTC1_UARTCLK, + }, + { + .ident = "nanoETXexpress-TT", + { + DMI_MATCH(DMI_BOARD_NAME, "nanoETXexpress-TT"), + }, + (void *)NTC1_UARTCLK, + }, + { + .ident = "MinnowBoard", + { + DMI_MATCH(DMI_BOARD_NAME, "MinnowBoard"), + }, + (void *)MINNOW_UARTCLK, + }, +}; + /* Return UART clock, checking for board specific clocks. */ static int pch_uart_get_uartclk(void) { - const char *cmp; + const struct dmi_system_id *d; if (user_uartclk) return user_uartclk; - cmp = dmi_get_system_info(DMI_BOARD_NAME); - if (cmp && strstr(cmp, "CM-iTC")) - return CMITC_UARTCLK; - - cmp = dmi_get_system_info(DMI_BIOS_VERSION); - if (cmp && strnstr(cmp, "FRI2", 4)) - return FRI2_64_UARTCLK; - - cmp = dmi_get_system_info(DMI_PRODUCT_NAME); - if (cmp && strstr(cmp, "Fish River Island II")) - return FRI2_48_UARTCLK; - - /* Kontron COMe-mTT10 (nanoETXexpress-TT) */ - cmp = dmi_get_system_info(DMI_BOARD_NAME); - if (cmp && (strstr(cmp, "COMe-mTT") || - strstr(cmp, "nanoETXexpress-TT"))) - return NTC1_UARTCLK; - - cmp = dmi_get_system_info(DMI_BOARD_NAME); - if (cmp && strstr(cmp, "MinnowBoard")) - return MINNOW_UARTCLK; + d = dmi_first_match(pch_uart_dmi_table); + if (d) + return (int)d->driver_data; return DEFAULT_UARTCLK; } -- 1.8.1.2 -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard 2013-06-26 3:58 ` Darren Hart @ 2013-06-26 4:16 ` Greg Kroah-Hartman 2013-06-26 6:43 ` Jiri Slaby 1 sibling, 0 replies; 10+ messages in thread From: Greg Kroah-Hartman @ 2013-06-26 4:16 UTC (permalink / raw) To: Darren Hart Cc: Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, Jiri Slaby, linux-serial On Tue, Jun 25, 2013 at 08:58:45PM -0700, Darren Hart wrote: > > How about this, which makes it easy to backport, then you fix it up > > properly for 3.12? This comes after my tree is pretty much closed for > > 3.11, but a simple device id addition like this is acceptable, but I'll > > not get to it until after 3.11-rc1 is out... > > Sure. So something like this is what you have in mind? Build tested > only, I'll include it in V2 with proper testing, but just wanted to > make sure we're on the same page while I have your attention: Yes, that patch looks good to me, and it makes it easier to add new devices later as well. thanks, greg k-h ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard 2013-06-26 3:58 ` Darren Hart 2013-06-26 4:16 ` Greg Kroah-Hartman @ 2013-06-26 6:43 ` Jiri Slaby 2013-06-26 7:19 ` Darren Hart 1 sibling, 1 reply; 10+ messages in thread From: Jiri Slaby @ 2013-06-26 6:43 UTC (permalink / raw) To: Darren Hart, Greg Kroah-Hartman Cc: Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, linux-serial On 06/26/2013 05:58 AM, Darren Hart wrote: > Subject: [PATCH] pch_uart: Use DMI interface for board detection > > Use the DMI interface rather than manually matching DMI strings. > > Signed-off-by: Darren Hart <dvhart@linux.intel.com> > --- > drivers/tty/serial/pch_uart.c | 71 > +++++++++++++++++++++++++++++-------------- > 1 file changed, 49 insertions(+), 22 deletions(-) > > diff --git a/drivers/tty/serial/pch_uart.c > b/drivers/tty/serial/pch_uart.c > index 572d481..271cc73 100644 > --- a/drivers/tty/serial/pch_uart.c > +++ b/drivers/tty/serial/pch_uart.c > @@ -373,35 +373,62 @@ static const struct file_operations port_regs_ops > = { > }; > #endif /* CONFIG_DEBUG_FS */ > > +static struct dmi_system_id __initdata pch_uart_dmi_table[] = { > + { > + .ident = "CM-iTC", > + { > + DMI_MATCH(DMI_BOARD_NAME, "CM-iTC"), > + }, > + (void *)CMITC_UARTCLK, > + }, > + { > + .ident = "FRI2", > + { > + DMI_MATCH(DMI_BIOS_VERSION, "FRI2"), > + }, > + (void *)FRI2_64_UARTCLK, > + }, > + { > + .ident = "Fish River Island II", > + { > + DMI_MATCH(DMI_PRODUCT_NAME, "Fish River Island II"), > + }, > + (void *)FRI2_48_UARTCLK, > + }, > + { > + .ident = "COMe-mTT", > + { > + DMI_MATCH(DMI_BOARD_NAME, "COMe-mTT"), > + }, > + (void *)NTC1_UARTCLK, > + }, > + { > + .ident = "nanoETXexpress-TT", > + { > + DMI_MATCH(DMI_BOARD_NAME, "nanoETXexpress-TT"), > + }, > + (void *)NTC1_UARTCLK, > + }, > + { > + .ident = "MinnowBoard", > + { > + DMI_MATCH(DMI_BOARD_NAME, "MinnowBoard"), > + }, > + (void *)MINNOW_UARTCLK, > + }, > +}; > + > /* Return UART clock, checking for board specific clocks. */ > static int pch_uart_get_uartclk(void) > { > - const char *cmp; > + const struct dmi_system_id *d; > > if (user_uartclk) > return user_uartclk; > > - cmp = dmi_get_system_info(DMI_BOARD_NAME); > - if (cmp && strstr(cmp, "CM-iTC")) > - return CMITC_UARTCLK; > - > - cmp = dmi_get_system_info(DMI_BIOS_VERSION); > - if (cmp && strnstr(cmp, "FRI2", 4)) > - return FRI2_64_UARTCLK; > - > - cmp = dmi_get_system_info(DMI_PRODUCT_NAME); > - if (cmp && strstr(cmp, "Fish River Island II")) > - return FRI2_48_UARTCLK; > - > - /* Kontron COMe-mTT10 (nanoETXexpress-TT) */ > - cmp = dmi_get_system_info(DMI_BOARD_NAME); > - if (cmp && (strstr(cmp, "COMe-mTT") || > - strstr(cmp, "nanoETXexpress-TT"))) > - return NTC1_UARTCLK; > - > - cmp = dmi_get_system_info(DMI_BOARD_NAME); > - if (cmp && strstr(cmp, "MinnowBoard")) > - return MINNOW_UARTCLK; > + d = dmi_first_match(pch_uart_dmi_table); > + if (d) > + return (int)d->driver_data; This and the (void *) casts above will generate a warning on 64bit, right? We need to go through long here... -- js suse labs ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard 2013-06-26 6:43 ` Jiri Slaby @ 2013-06-26 7:19 ` Darren Hart 2013-06-26 7:25 ` Jiri Slaby 0 siblings, 1 reply; 10+ messages in thread From: Darren Hart @ 2013-06-26 7:19 UTC (permalink / raw) To: Jiri Slaby Cc: Greg Kroah-Hartman, Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, linux-serial On Wed, 2013-06-26 at 08:43 +0200, Jiri Slaby wrote: > On 06/26/2013 05:58 AM, Darren Hart wrote: > > Subject: [PATCH] pch_uart: Use DMI interface for board detection > > > > Use the DMI interface rather than manually matching DMI strings. > > > > Signed-off-by: Darren Hart <dvhart@linux.intel.com> > > --- > > drivers/tty/serial/pch_uart.c | 71 > > +++++++++++++++++++++++++++++-------------- > > 1 file changed, 49 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/tty/serial/pch_uart.c > > b/drivers/tty/serial/pch_uart.c > > index 572d481..271cc73 100644 > > --- a/drivers/tty/serial/pch_uart.c > > +++ b/drivers/tty/serial/pch_uart.c > > @@ -373,35 +373,62 @@ static const struct file_operations port_regs_ops > > = { > > }; > > #endif /* CONFIG_DEBUG_FS */ > > > > +static struct dmi_system_id __initdata pch_uart_dmi_table[] = { > > + { > > + .ident = "CM-iTC", > > + { > > + DMI_MATCH(DMI_BOARD_NAME, "CM-iTC"), > > + }, > > + (void *)CMITC_UARTCLK, > > + }, > > + { > > + .ident = "FRI2", > > + { > > + DMI_MATCH(DMI_BIOS_VERSION, "FRI2"), > > + }, > > + (void *)FRI2_64_UARTCLK, > > + }, > > + { > > + .ident = "Fish River Island II", > > + { > > + DMI_MATCH(DMI_PRODUCT_NAME, "Fish River Island II"), > > + }, > > + (void *)FRI2_48_UARTCLK, > > + }, > > + { > > + .ident = "COMe-mTT", > > + { > > + DMI_MATCH(DMI_BOARD_NAME, "COMe-mTT"), > > + }, > > + (void *)NTC1_UARTCLK, > > + }, > > + { > > + .ident = "nanoETXexpress-TT", > > + { > > + DMI_MATCH(DMI_BOARD_NAME, "nanoETXexpress-TT"), > > + }, > > + (void *)NTC1_UARTCLK, > > + }, > > + { > > + .ident = "MinnowBoard", > > + { > > + DMI_MATCH(DMI_BOARD_NAME, "MinnowBoard"), > > + }, > > + (void *)MINNOW_UARTCLK, > > + }, > > +}; > > + > > /* Return UART clock, checking for board specific clocks. */ > > static int pch_uart_get_uartclk(void) > > { > > - const char *cmp; > > + const struct dmi_system_id *d; > > > > if (user_uartclk) > > return user_uartclk; > > > > - cmp = dmi_get_system_info(DMI_BOARD_NAME); > > - if (cmp && strstr(cmp, "CM-iTC")) > > - return CMITC_UARTCLK; > > - > > - cmp = dmi_get_system_info(DMI_BIOS_VERSION); > > - if (cmp && strnstr(cmp, "FRI2", 4)) > > - return FRI2_64_UARTCLK; > > - > > - cmp = dmi_get_system_info(DMI_PRODUCT_NAME); > > - if (cmp && strstr(cmp, "Fish River Island II")) > > - return FRI2_48_UARTCLK; > > - > > - /* Kontron COMe-mTT10 (nanoETXexpress-TT) */ > > - cmp = dmi_get_system_info(DMI_BOARD_NAME); > > - if (cmp && (strstr(cmp, "COMe-mTT") || > > - strstr(cmp, "nanoETXexpress-TT"))) > > - return NTC1_UARTCLK; > > - > > - cmp = dmi_get_system_info(DMI_BOARD_NAME); > > - if (cmp && strstr(cmp, "MinnowBoard")) > > - return MINNOW_UARTCLK; > > + d = dmi_first_match(pch_uart_dmi_table); > > + if (d) > > + return (int)d->driver_data; > > This and the (void *) casts above will generate a warning on 64bit, > right? We need to go through long here... > You can't actually use this driver on 64 bit as there is no hardware, but yes, I can clean that up just on principle. Thank you for pointing that out. -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard 2013-06-26 7:19 ` Darren Hart @ 2013-06-26 7:25 ` Jiri Slaby 2013-06-26 16:23 ` Darren Hart 0 siblings, 1 reply; 10+ messages in thread From: Jiri Slaby @ 2013-06-26 7:25 UTC (permalink / raw) To: Darren Hart Cc: Greg Kroah-Hartman, Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, linux-serial On 06/26/2013 09:19 AM, Darren Hart wrote: > You can't actually use this driver on 64 bit as there is no hardware, Oh, so is this another candidate for adding dependson (X86_32 || COMPILE_TEST) as well as the other *_PCH options? -- js suse labs ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard 2013-06-26 7:25 ` Jiri Slaby @ 2013-06-26 16:23 ` Darren Hart 0 siblings, 0 replies; 10+ messages in thread From: Darren Hart @ 2013-06-26 16:23 UTC (permalink / raw) To: Jiri Slaby Cc: Greg Kroah-Hartman, Linux Kernel Mailing List, H. Peter Anvin, peter.p.waskiewicz.jr, andriy.shevchenko, danders, vishal.l.verma, linux-serial On Wed, 2013-06-26 at 09:25 +0200, Jiri Slaby wrote: > On 06/26/2013 09:19 AM, Darren Hart wrote: > > You can't actually use this driver on 64 bit as there is no hardware, > > Oh, so is this another candidate for adding dependson (X86_32 || > COMPILE_TEST) as well as the other *_PCH options? As far as I know it isn't that you couldn't use it with a 64b CPU, it just hasn't been. I'm happy to use a long as you suggest. -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-06-26 16:23 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <cover.1372211451.git.dvhart@linux.intel.com> 2013-06-26 1:53 ` [PATCH 2/8] pch_uart: Add uart_clk selection for the MinnowBoard Darren Hart 2013-06-26 2:31 ` Greg Kroah-Hartman 2013-06-26 3:16 ` Darren Hart 2013-06-26 3:39 ` Greg Kroah-Hartman 2013-06-26 3:58 ` Darren Hart 2013-06-26 4:16 ` Greg Kroah-Hartman 2013-06-26 6:43 ` Jiri Slaby 2013-06-26 7:19 ` Darren Hart 2013-06-26 7:25 ` Jiri Slaby 2013-06-26 16:23 ` Darren Hart
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).