x86/earlyprintk: Add a force option for pciserial device
Subsystems (2)
PATCH v3 1/1 x86/earlyprintk: Add a force option for pciserial device
"pciserial" earlyprintk helps much on many modern x86 platforms, but unfortunately there are still some platforms whose PCI UART devices have wrong PCI class code, which will be blocked by current class code check.
Add a option "force" so that developer could still use a UART device even it has wrong class code, with format "",force,B:D.F,baud". And the original format ",B:D.F,baud" is kept unchanged.
--- Documentation/admin-guide/kernel-parameters.txt | 6 +++++- arch/x86/kernel/early_printk.c | 26 +++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +5 -1
@@ -1063,7 +1063,7 @@ earlyprintk=serial[,0x...[,baudrate]] earlyprintk=ttySn[,baudrate] earlyprintk=dbgp[debugController#] - earlyprintk=pciserial,bus:device.function[,baudrate] + earlyprintk=pciserial[,force],bus:device.function[,baudrate] earlyprintk=xdbc[xhciController#] earlyprintk is useful when the kernel crashes before
@@ -1095,6 +1095,10 @@ The sclp output can only be used on s390. + The optional "force" for pciserial means insisting to + use a PCI device even when its classcode is not of + UART class. + edac_report= [HW,EDAC] Control how to report EDAC event Format: {"on" | "off" | "force"} on: enable EDAC to report H/W event. May be overridden
arch/x86/kernel/early_printk.c +18 -8
@@ -213,8 +213,10 @@ static unsigned int mem32_serial_in(unsigned long addr, int offset)* early_pci_serial_init() * * This function is invoked when the early_printk param starts with "pciserial" -* The rest of the param should be ",B:D.F,baud" where B, D & F describe the -* location of a PCI device that must be a UART device. +* The rest of the param should be ",B:D.F,baud" or ",force,B:D.F,baud", where +* B, D & F describe the location of a PCI device that must be a UART device, +* "force" is optional and means insisting using a UART device with a wrong +* pci class code. */ static __init void early_pci_serial_init (char *s) {
@@ -224,17 +226,23 @@ static __init void early_pci_serial_init(char *s)u32 classcode, bar0;u16 cmdreg;char *e; +int force =0 ; - -/* -* First, part the param to get the BDF values -*/ if (*s ==',' ) ++s;if (*s ==0 )return ; +/* User may insist to use a UART device with wrong class code */ +if (!strncmp (s,"force," ,6 )) { + force =1 ; + s +=6 ; + } + +/* +* First, part the param to get the BDF values +*/ bus = (u8 )simple_strtoul (s, &e,16 ); s = e;if (*s !=':' )
@@ -264,8 +272,10 @@ static __init void early_pci_serial_init(char *s)*/ if (((classcode >>16 !=PCI_CLASS_COMMUNICATION_MODEM ) && (classcode >>16 !=PCI_CLASS_COMMUNICATION_SERIAL )) || - (((classcode >>8 ) &0xff ) !=0x02 ))/* 16550 I/F at BAR0 */ -return ; + (((classcode >>8 ) &0xff ) !=0x02 ))/* 16550 I/F at BAR0 */ { +if (!force) +return ; + }/* * Determine if it is IO or memory mapped
Signature · 1 line
2.7.4
tip-bot for Feng Tang
merge botx86/earlyprintk: Add a force option for pciserial device
Commit-ID: fa7948a6413c63128335aa871fade8df55ac61e2 Gitweb: https://git.kernel.org/tip/fa7948a6413c63128335aa871fade8df55ac61e2 Author: Feng Tang <[email protected]> AuthorDate: Wed, 3 Oct 2018 00:49:21 +0800 Committer: Borislav Petkov <[email protected]> CommitDate: Tue, 2 Oct 2018 20:40:27 +0200
x86/earlyprintk: Add a force option for pciserial device
The "pciserial" earlyprintk variant helps much on many modern x86 platforms, but unfortunately there are still some platforms with PCI UART devices which have the wrong PCI class code. In that case, the current class code check does not allow for them to be used for logging.
Add a sub-option "force" which overrides the class code check and thus the use of such device can be enforced.
[ bp: massage formulations. ]
--- Documentation/admin-guide/kernel-parameters.txt | 6 ++++- arch/x86/kernel/early_printk.c | 29 ++++++++++++++++--------- 2 files changed, 24 insertions(+), 11 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +5 -1
@@ -1063,7 +1063,7 @@ earlyprintk=serial[,0x...[,baudrate]] earlyprintk=ttySn[,baudrate] earlyprintk=dbgp[debugController#] - earlyprintk=pciserial,bus:device.function[,baudrate] + earlyprintk=pciserial[,force],bus:device.function[,baudrate] earlyprintk=xdbc[xhciController#] earlyprintk is useful when the kernel crashes before
@@ -1095,6 +1095,10 @@ The sclp output can only be used on s390. + The optional "force" to "pciserial" enables use of a + PCI device even when its classcode is not of the + UART class. + edac_report= [HW,EDAC] Control how to report EDAC event Format: {"on" | "off" | "force"} on: enable EDAC to report H/W event. May be overridden
arch/x86/kernel/early_printk.c +19 -10
@@ -213,8 +213,9 @@ static unsigned int mem32_serial_in(unsigned long addr, int offset)* early_pci_serial_init() * * This function is invoked when the early_printk param starts with "pciserial" -* The rest of the param should be ",B:D.F,baud" where B, D & F describe the -* location of a PCI device that must be a UART device. +* The rest of the param should be "[force],B:D.F,baud", where B, D & F describe +* the location of a PCI device that must be a UART device. "force" is optional +* and overrides the use of an UART device with a wrong PCI class code. */ static __init void early_pci_serial_init (char *s) {
@@ -224,17 +225,23 @@ static __init void early_pci_serial_init(char *s)u32 classcode, bar0;u16 cmdreg;char *e; +int force =0 ; - -/* -* First, part the param to get the BDF values -*/ if (*s ==',' ) ++s;if (*s ==0 )return ; +/* Force the use of an UART device with wrong class code */ +if (!strncmp (s,"force," ,6 )) { + force =1 ; + s +=6 ; + } + +/* +* Part the param to get the BDF values +*/ bus = (u8 )simple_strtoul (s, &e,16 ); s = e;if (*s !=':' )
@@ -253,7 +260,7 @@ static __init void early_pci_serial_init(char *s) s++;/* -* Second, find the device from the BDF +* Find the device from the BDF */ cmdreg =read_pci_config (bus, slot, func,PCI_COMMAND ); classcode =read_pci_config (bus, slot, func,PCI_CLASS_REVISION );
@@ -264,8 +271,10 @@ static __init void early_pci_serial_init(char *s)*/ if (((classcode >>16 !=PCI_CLASS_COMMUNICATION_MODEM ) && (classcode >>16 !=PCI_CLASS_COMMUNICATION_SERIAL )) || - (((classcode >>8 ) &0xff ) !=0x02 ))/* 16550 I/F at BAR0 */ -return ; + (((classcode >>8 ) &0xff ) !=0x02 ))/* 16550 I/F at BAR0 */ { +if (!force) +return ; + }/* * Determine if it is IO or memory mapped
@@ -289,7 +298,7 @@ static __init void early_pci_serial_init(char *s) }/* -* Lastly, initialize the hardware +* Initialize the hardware */ if (*s) {if (strcmp (s,"nocfg" ) ==0 )
tip-bot for Feng Tang
merge botx86/earlyprintk: Add a force option for pciserial device
Commit-ID: d2266bbfa9e3e32e3b642965088ca461bd24a94f Gitweb: https://git.kernel.org/tip/d2266bbfa9e3e32e3b642965088ca461bd24a94f Author: Feng Tang <[email protected]> AuthorDate: Wed, 3 Oct 2018 00:49:21 +0800 Committer: Borislav Petkov <[email protected]> CommitDate: Tue, 2 Oct 2018 21:02:47 +0200
x86/earlyprintk: Add a force option for pciserial device
The "pciserial" earlyprintk variant helps much on many modern x86 platforms, but unfortunately there are still some platforms with PCI UART devices which have the wrong PCI class code. In that case, the current class code check does not allow for them to be used for logging.
Add a sub-option "force" which overrides the class code check and thus the use of such device can be enforced.
[ bp: massage formulations. ]
--- Documentation/admin-guide/kernel-parameters.txt | 6 ++++- arch/x86/kernel/early_printk.c | 29 ++++++++++++++++--------- 2 files changed, 24 insertions(+), 11 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +5 -1
@@ -1063,7 +1063,7 @@ earlyprintk=serial[,0x...[,baudrate]] earlyprintk=ttySn[,baudrate] earlyprintk=dbgp[debugController#] - earlyprintk=pciserial,bus:device.function[,baudrate] + earlyprintk=pciserial[,force],bus:device.function[,baudrate] earlyprintk=xdbc[xhciController#] earlyprintk is useful when the kernel crashes before
@@ -1095,6 +1095,10 @@ The sclp output can only be used on s390. + The optional "force" to "pciserial" enables use of a + PCI device even when its classcode is not of the + UART class. + edac_report= [HW,EDAC] Control how to report EDAC event Format: {"on" | "off" | "force"} on: enable EDAC to report H/W event. May be overridden
arch/x86/kernel/early_printk.c +19 -10
@@ -213,8 +213,9 @@ static unsigned int mem32_serial_in(unsigned long addr, int offset)* early_pci_serial_init() * * This function is invoked when the early_printk param starts with "pciserial" -* The rest of the param should be ",B:D.F,baud" where B, D & F describe the -* location of a PCI device that must be a UART device. +* The rest of the param should be "[force],B:D.F,baud", where B, D & F describe +* the location of a PCI device that must be a UART device. "force" is optional +* and overrides the use of an UART device with a wrong PCI class code. */ static __init void early_pci_serial_init (char *s) {
@@ -224,17 +225,23 @@ static __init void early_pci_serial_init(char *s)u32 classcode, bar0;u16 cmdreg;char *e; +int force =0 ; - -/* -* First, part the param to get the BDF values -*/ if (*s ==',' ) ++s;if (*s ==0 )return ; +/* Force the use of an UART device with wrong class code */ +if (!strncmp (s,"force," ,6 )) { + force =1 ; + s +=6 ; + } + +/* +* Part the param to get the BDF values +*/ bus = (u8 )simple_strtoul (s, &e,16 ); s = e;if (*s !=':' )
@@ -253,7 +260,7 @@ static __init void early_pci_serial_init(char *s) s++;/* -* Second, find the device from the BDF +* Find the device from the BDF */ cmdreg =read_pci_config (bus, slot, func,PCI_COMMAND ); classcode =read_pci_config (bus, slot, func,PCI_CLASS_REVISION );
@@ -264,8 +271,10 @@ static __init void early_pci_serial_init(char *s)*/ if (((classcode >>16 !=PCI_CLASS_COMMUNICATION_MODEM ) && (classcode >>16 !=PCI_CLASS_COMMUNICATION_SERIAL )) || - (((classcode >>8 ) &0xff ) !=0x02 ))/* 16550 I/F at BAR0 */ -return ; + (((classcode >>8 ) &0xff ) !=0x02 ))/* 16550 I/F at BAR0 */ { +if (!force) +return ; + }/* * Determine if it is IO or memory mapped
@@ -289,7 +298,7 @@ static __init void early_pci_serial_init(char *s) }/* -* Lastly, initialize the hardware +* Initialize the hardware */ if (*s) {if (strcmp (s,"nocfg" ) ==0 )