Re: linux-next: Tree for Aug 8
Hi Masahiro, On Fri, 9 Aug 2019 13:44:19 +0900 Masahiro Yamada wrote: > > Stephen, could you revert this commit for today's linux-next ? Sorry, I discovered your email too late :-( -- Cheers, Stephen Rothwell pgpsF4ld4i1FG.pgp Description: OpenPGP digital signature
Re: linux-next: Tree for Aug 8
Hi Heiko, Stephen, On Fri, Aug 9, 2019 at 7:53 AM Heiko Carstens wrote: > > On Thu, Aug 08, 2019 at 06:17:39PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20190807: > > > > I reverted a commit from the kbuild-current tree by request. > > Hello Masahiro, > > it looks like there is (another?) bug in kbuild. With your patch > > commit 421a15c167b2d1f43f287da5b75ef2704650640b (refs/bisect/bad) > Author: Masahiro Yamada > Date: Fri Jul 26 11:17:47 2019 +0900 > > kbuild: clean-up subdir-ym computation > > The intermediate variables __subdir-{y,m} are unneeded. > > Signed-off-by: Masahiro Yamada > > the file modules.builtin starts to miss a lot of entries when building > the kernel tree. Reverting that patch on top of linux-next 20190808 > restores the old behaviour. > > This is the diff I get without and with the above commit (s390 with > defconfig): > > --- modules.builtin.ok 2019-08-09 00:39:58.148624485 +0200 > +++ modules.builtin 2019-08-09 00:40:07.878637541 +0200 You are right. This commit is bad. Stephen, could you revert this commit for today's linux-next ? BTW, I had dropped this commit from my branch (with another reason), but I forgot to push it to the public place... -- Best Regards Masahiro Yamada
Re: linux-next: Tree for Aug 8
On Thu, Aug 08, 2019 at 06:17:39PM +1000, Stephen Rothwell wrote: > Hi all, > > Changes since 20190807: > > I reverted a commit from the kbuild-current tree by request. Hello Masahiro, it looks like there is (another?) bug in kbuild. With your patch commit 421a15c167b2d1f43f287da5b75ef2704650640b (refs/bisect/bad) Author: Masahiro Yamada Date: Fri Jul 26 11:17:47 2019 +0900 kbuild: clean-up subdir-ym computation The intermediate variables __subdir-{y,m} are unneeded. Signed-off-by: Masahiro Yamada the file modules.builtin starts to miss a lot of entries when building the kernel tree. Reverting that patch on top of linux-next 20190808 restores the old behaviour. This is the diff I get without and with the above commit (s390 with defconfig): --- modules.builtin.ok 2019-08-09 00:39:58.148624485 +0200 +++ modules.builtin 2019-08-09 00:40:07.878637541 +0200 @@ -1,5 +1,3 @@ -arch/s390/crypto/crc32-vx_s390.ko -arch/s390/net/pnet.ko kernel/configs.ko mm/zpool.ko fs/binfmt_script.ko @@ -46,67 +44,19 @@ crypto/jitterentropy_rng.ko crypto/ghash-generic.ko crypto/xor.ko -crypto/asymmetric_keys/public_key.ko -crypto/asymmetric_keys/x509_key_parser.ko -crypto/asymmetric_keys/pkcs7_message.ko block/mq-deadline.ko block/kyber-iosched.ko block/bfq.ko -drivers/base/firmware_loader/firmware_class.ko -drivers/block/brd.ko -drivers/block/virtio_blk.ko -drivers/char/virtio_console.ko -drivers/char/tpm/tpm.ko drivers/connector/cn.ko drivers/dax/dax.ko -drivers/gpu/drm/drm_kms_helper.ko -drivers/gpu/drm/drm.ko -drivers/gpu/drm/drm_panel_orientation_quirks.ko -drivers/gpu/drm/ttm/ttm.ko -drivers/gpu/drm/virtio/virtio-gpu.ko -drivers/i2c/i2c-core.ko -drivers/i2c/algos/i2c-algo-bit.ko drivers/input/input-core.ko drivers/input/evdev.ko -drivers/md/md-mod.ko -drivers/scsi/scsi_mod.ko -drivers/scsi/scsi_transport_fc.ko -drivers/scsi/sd_mod.ko -drivers/scsi/sg.ko -drivers/video/fbdev/core/fb.ko -drivers/video/fbdev/core/cfbfillrect.ko -drivers/video/fbdev/core/cfbcopyarea.ko -drivers/video/fbdev/core/cfbimgblt.ko -drivers/video/fbdev/core/sysfillrect.ko -drivers/video/fbdev/core/syscopyarea.ko -drivers/video/fbdev/core/sysimgblt.ko -drivers/video/fbdev/core/fb_sys_fops.ko drivers/virtio/virtio.ko drivers/virtio/virtio_ring.ko drivers/virtio/virtio_input.ko -drivers/watchdog/watchdog.ko -drivers/s390/block/dasd_mod.ko -drivers/s390/block/dasd_diag_mod.ko -drivers/s390/block/dasd_eckd_mod.ko -drivers/s390/block/dasd_fba_mod.ko -drivers/s390/char/raw3270.ko -drivers/s390/char/tty3270.ko -drivers/s390/char/fs3270.ko -drivers/s390/cio/chsc_sch.ko -drivers/s390/cio/ccwgroup.ko -drivers/s390/cio/qdio.ko -drivers/s390/net/qeth.ko -drivers/s390/net/qeth_l2.ko -drivers/s390/net/qeth_l3.ko -drivers/s390/scsi/zfcp.ko net/dns_resolver/dns_resolver.ko -net/ipv4/tcp_cubic.ko -net/ipv6/ipv6.ko -net/ipv6/inet6_hashtables.ko net/iucv/iucv.ko net/packet/af_packet.ko -net/sched/cls_cgroup.ko -net/unix/unix.ko lib/bitrev.ko lib/crc16.ko lib/crc-t10dif.ko @@ -117,7 +67,6 @@ lib/digsig.ko lib/asn1_decoder.ko lib/oid_registry.ko -lib/crypto/libaes.ko lib/fonts/font.ko lib/lz4/lz4_decompress.ko lib/lzo/lzo_compress.ko
Re: linux-next: Tree for Aug 8
Hi Andrew, On Mon, 8 Aug 2016 13:51:22 +1000 Andrew Donnellanwrote: > > On 08/08/16 13:17, Stephen Rothwell wrote: > > Please do not add material destined for v4.9 to your linux-next included > > branches until after v4.8-rc1 has been released. > > Which has now happened :) Yes, I will remove the above message tomorrow. -- Cheers, Stephen Rothwell
Re: linux-next: Tree for Aug 8
Hi Andrew, On Mon, 8 Aug 2016 13:51:22 +1000 Andrew Donnellan wrote: > > On 08/08/16 13:17, Stephen Rothwell wrote: > > Please do not add material destined for v4.9 to your linux-next included > > branches until after v4.8-rc1 has been released. > > Which has now happened :) Yes, I will remove the above message tomorrow. -- Cheers, Stephen Rothwell
Re: linux-next: Tree for Aug 8
On 08/08/16 13:17, Stephen Rothwell wrote: Please do not add material destined for v4.9 to your linux-next included branches until after v4.8-rc1 has been released. Which has now happened :) -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnel...@au1.ibm.com IBM Australia Limited
Re: linux-next: Tree for Aug 8
On 08/08/16 13:17, Stephen Rothwell wrote: Please do not add material destined for v4.9 to your linux-next included branches until after v4.8-rc1 has been released. Which has now happened :) -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnel...@au1.ibm.com IBM Australia Limited
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On Mon, Aug 12, 2013 at 7:18 AM, Jason Cooper wrote: > On Sat, Aug 10, 2013 at 08:01:49AM -0600, Bjorn Helgaas wrote: >> On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper wrote: >> > Randy, >> > >> > On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: >> >> On 08/09/13 07:59, Jason Cooper wrote: >> >> > Randy, >> >> > >> >> > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: >> >> >> On 08/08/13 00:08, Stephen Rothwell wrote: >> >> >>> Hi all, >> >> >>> >> >> >>> Changes since 20130807: >> >> >>> >> >> >> >> >> >> on i386 and x86_64: >> >> >> when CONFIG_PCI_MSI is not enabled: >> >> >> >> >> >> There are many of these errors: >> >> >> include/linux/msi.h:65:6: error: expected identifier or '(' before >> >> >> 'void' >> >> >> include/linux/msi.h:65:6: error: expected ')' before numeric constant >> >> >> >> >> >> because arch/x86/include/asm/pci.h defines: >> >> >> #define default_teardown_msi_irqs NULL >> >> > >> >> > Do you have an example config you used? >> >> >> >> Sure, attached. (or I have 14 of them) >> > >> > Thanks, I was able to reproduce the error. I'm not real familiar with >> > this area of the code, but the relief is it doesn't appear to be caused >> > by the mvebu changes (well, relief for us ;-) ). >> > >> > At any rate, give this a spin and see if it works for you >> > >> > If it's acceptable, I'll do an official patch for Bjorn. >> > >> > thx, >> > >> > Jason. >> > >> > -->8-- >> > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h >> > index d9e9e6c..6169414 100644 >> > --- a/arch/x86/include/asm/pci.h >> > +++ b/arch/x86/include/asm/pci.h >> > @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int >> > irq); >> > #else >> > #define native_setup_msi_irqs NULL >> > #define native_teardown_msi_irqNULL >> > -#define default_teardown_msi_irqs NULL >> > -#define default_restore_msi_irqs NULL >> > +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } >> > +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } >> >> I don't really like this solution of putting the empty implementation >> in the header file, because then a weak body is generated in the >> object of every source file that includes the header. >> >> default_teardown_msi_irqs() and default_restore_msi_irqs() seem like >> fairly internal MSI functions, so I wonder why we need them defined at >> all when CONFIG_PCI_MSI=n. It seems like any uses of them should be >> in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't >> reproduced the problem and investigated yet. > > I first tried commenting out the definitions after reproducing the > problem. It also failed miserably. > > Please take a look at Thomas' latest MSI patch series, > > [PATCHv9 01/10] PCI: use weak functions for MSI arch-specific functions > > I think his solution is much nicer than mine. OK, I'll assume I don't need to do anything until I hear otherwise. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On Sat, Aug 10, 2013 at 08:01:49AM -0600, Bjorn Helgaas wrote: > On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper wrote: > > Randy, > > > > On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: > >> On 08/09/13 07:59, Jason Cooper wrote: > >> > Randy, > >> > > >> > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: > >> >> On 08/08/13 00:08, Stephen Rothwell wrote: > >> >>> Hi all, > >> >>> > >> >>> Changes since 20130807: > >> >>> > >> >> > >> >> on i386 and x86_64: > >> >> when CONFIG_PCI_MSI is not enabled: > >> >> > >> >> There are many of these errors: > >> >> include/linux/msi.h:65:6: error: expected identifier or '(' before > >> >> 'void' > >> >> include/linux/msi.h:65:6: error: expected ')' before numeric constant > >> >> > >> >> because arch/x86/include/asm/pci.h defines: > >> >> #define default_teardown_msi_irqs NULL > >> > > >> > Do you have an example config you used? > >> > >> Sure, attached. (or I have 14 of them) > > > > Thanks, I was able to reproduce the error. I'm not real familiar with > > this area of the code, but the relief is it doesn't appear to be caused > > by the mvebu changes (well, relief for us ;-) ). > > > > At any rate, give this a spin and see if it works for you > > > > If it's acceptable, I'll do an official patch for Bjorn. > > > > thx, > > > > Jason. > > > > -->8-- > > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h > > index d9e9e6c..6169414 100644 > > --- a/arch/x86/include/asm/pci.h > > +++ b/arch/x86/include/asm/pci.h > > @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int > > irq); > > #else > > #define native_setup_msi_irqs NULL > > #define native_teardown_msi_irqNULL > > -#define default_teardown_msi_irqs NULL > > -#define default_restore_msi_irqs NULL > > +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } > > +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } > > I don't really like this solution of putting the empty implementation > in the header file, because then a weak body is generated in the > object of every source file that includes the header. > > default_teardown_msi_irqs() and default_restore_msi_irqs() seem like > fairly internal MSI functions, so I wonder why we need them defined at > all when CONFIG_PCI_MSI=n. It seems like any uses of them should be > in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't > reproduced the problem and investigated yet. I first tried commenting out the definitions after reproducing the problem. It also failed miserably. Please take a look at Thomas' latest MSI patch series, [PATCHv9 01/10] PCI: use weak functions for MSI arch-specific functions I think his solution is much nicer than mine. thx, Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On Sat, Aug 10, 2013 at 08:01:49AM -0600, Bjorn Helgaas wrote: On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper ja...@lakedaemon.net wrote: Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } I don't really like this solution of putting the empty implementation in the header file, because then a weak body is generated in the object of every source file that includes the header. default_teardown_msi_irqs() and default_restore_msi_irqs() seem like fairly internal MSI functions, so I wonder why we need them defined at all when CONFIG_PCI_MSI=n. It seems like any uses of them should be in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't reproduced the problem and investigated yet. I first tried commenting out the definitions after reproducing the problem. It also failed miserably. Please take a look at Thomas' latest MSI patch series, [PATCHv9 01/10] PCI: use weak functions for MSI arch-specific functions I think his solution is much nicer than mine. thx, Jason. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On Mon, Aug 12, 2013 at 7:18 AM, Jason Cooper ja...@lakedaemon.net wrote: On Sat, Aug 10, 2013 at 08:01:49AM -0600, Bjorn Helgaas wrote: On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper ja...@lakedaemon.net wrote: Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } I don't really like this solution of putting the empty implementation in the header file, because then a weak body is generated in the object of every source file that includes the header. default_teardown_msi_irqs() and default_restore_msi_irqs() seem like fairly internal MSI functions, so I wonder why we need them defined at all when CONFIG_PCI_MSI=n. It seems like any uses of them should be in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't reproduced the problem and investigated yet. I first tried commenting out the definitions after reproducing the problem. It also failed miserably. Please take a look at Thomas' latest MSI patch series, [PATCHv9 01/10] PCI: use weak functions for MSI arch-specific functions I think his solution is much nicer than mine. OK, I'll assume I don't need to do anything until I hear otherwise. Bjorn -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper wrote: > Randy, > > On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: >> On 08/09/13 07:59, Jason Cooper wrote: >> > Randy, >> > >> > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: >> >> On 08/08/13 00:08, Stephen Rothwell wrote: >> >>> Hi all, >> >>> >> >>> Changes since 20130807: >> >>> >> >> >> >> on i386 and x86_64: >> >> when CONFIG_PCI_MSI is not enabled: >> >> >> >> There are many of these errors: >> >> include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' >> >> include/linux/msi.h:65:6: error: expected ')' before numeric constant >> >> >> >> because arch/x86/include/asm/pci.h defines: >> >> #define default_teardown_msi_irqs NULL >> > >> > Do you have an example config you used? >> >> Sure, attached. (or I have 14 of them) > > Thanks, I was able to reproduce the error. I'm not real familiar with > this area of the code, but the relief is it doesn't appear to be caused > by the mvebu changes (well, relief for us ;-) ). > > At any rate, give this a spin and see if it works for you > > If it's acceptable, I'll do an official patch for Bjorn. > > thx, > > Jason. > > -->8-- > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h > index d9e9e6c..6169414 100644 > --- a/arch/x86/include/asm/pci.h > +++ b/arch/x86/include/asm/pci.h > @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int > irq); > #else > #define native_setup_msi_irqs NULL > #define native_teardown_msi_irqNULL > -#define default_teardown_msi_irqs NULL > -#define default_restore_msi_irqs NULL > +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } > +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } I don't really like this solution of putting the empty implementation in the header file, because then a weak body is generated in the object of every source file that includes the header. default_teardown_msi_irqs() and default_restore_msi_irqs() seem like fairly internal MSI functions, so I wonder why we need them defined at all when CONFIG_PCI_MSI=n. It seems like any uses of them should be in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't reproduced the problem and investigated yet. > #endif > > #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper ja...@lakedaemon.net wrote: Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } I don't really like this solution of putting the empty implementation in the header file, because then a weak body is generated in the object of every source file that includes the header. default_teardown_msi_irqs() and default_restore_msi_irqs() seem like fairly internal MSI functions, so I wonder why we need them defined at all when CONFIG_PCI_MSI=n. It seems like any uses of them should be in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't reproduced the problem and investigated yet. #endif #define PCI_DMA_BUS_IS_PHYS (dma_ops-is_phys) -- To unsubscribe from this list: send the line unsubscribe linux-pci in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On 08/09/13 11:50, Jason Cooper wrote: > Randy, > > On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: >> On 08/09/13 07:59, Jason Cooper wrote: >>> Randy, >>> >>> On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: > Hi all, > > Changes since 20130807: > on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL >>> >>> Do you have an example config you used? >> >> Sure, attached. (or I have 14 of them) > > Thanks, I was able to reproduce the error. I'm not real familiar with > this area of the code, but the relief is it doesn't appear to be caused > by the mvebu changes (well, relief for us ;-) ). > > At any rate, give this a spin and see if it works for you > > If it's acceptable, I'll do an official patch for Bjorn. Works for me -- tested with PCI_MSI enabled & disabled. Thanks. Acked-by: Randy Dunlap > thx, > > Jason. > > -->8-- > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h > index d9e9e6c..6169414 100644 > --- a/arch/x86/include/asm/pci.h > +++ b/arch/x86/include/asm/pci.h > @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int > irq); > #else > #define native_setup_msi_irqsNULL > #define native_teardown_msi_irq NULL > -#define default_teardown_msi_irqsNULL > -#define default_restore_msi_irqs NULL > +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } > +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } > #endif > > #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) > -- -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: > On 08/09/13 07:59, Jason Cooper wrote: > > Randy, > > > > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: > >> On 08/08/13 00:08, Stephen Rothwell wrote: > >>> Hi all, > >>> > >>> Changes since 20130807: > >>> > >> > >> on i386 and x86_64: > >> when CONFIG_PCI_MSI is not enabled: > >> > >> There are many of these errors: > >> include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' > >> include/linux/msi.h:65:6: error: expected ')' before numeric constant > >> > >> because arch/x86/include/asm/pci.h defines: > >> #define default_teardown_msi_irqs NULL > > > > Do you have an example config you used? > > Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. -->8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } #endif #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On 08/09/13 07:59, Jason Cooper wrote: > Randy, > > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: >> On 08/08/13 00:08, Stephen Rothwell wrote: >>> Hi all, >>> >>> Changes since 20130807: >>> >> >> on i386 and x86_64: >> when CONFIG_PCI_MSI is not enabled: >> >> There are many of these errors: >> include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' >> include/linux/msi.h:65:6: error: expected ')' before numeric constant >> >> because arch/x86/include/asm/pci.h defines: >> #define default_teardown_msi_irqsNULL > > Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks. -- ~Randy # # Automatically generated file; DO NOT EDIT. # Linux/x86_64 3.11.0-rc4 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ZONE_DMA32=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_COMPILE_TEST=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y # CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_BZIP2=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_HOSTNAME="(none)" # CONFIG_SYSVIPC is not set # CONFIG_POSIX_MQUEUE is not set # CONFIG_FHANDLE is not set CONFIG_AUDIT=y # CONFIG_AUDITSYSCALL is not set CONFIG_AUDIT_LOGINUID_IMMUTABLE=y CONFIG_HAVE_GENERIC_HARDIRQS=y # # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y # # Timers subsystem # CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ_COMMON=y # CONFIG_HZ_PERIODIC is not set CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ=y # CONFIG_HIGH_RES_TIMERS is not set # # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_TASKSTATS=y # CONFIG_TASK_DELAY_ACCT is not set CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y # # RCU Subsystem # CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set CONFIG_RCU_STALL_COMMON=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y CONFIG_CGROUP_DEBUG=y # CONFIG_CGROUP_FREEZER is not set # CONFIG_CGROUP_DEVICE is not set CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set # CONFIG_CGROUP_CPUACCT is not set # CONFIG_RESOURCE_COUNTERS is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y # CONFIG_RT_GROUP_SCHED is not set # CONFIG_CHECKPOINT_RESTORE is not set # CONFIG_NAMESPACES is not set CONFIG_UIDGID_CONVERTED=y CONFIG_UIDGID_STRICT_TYPE_CHECKS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set CONFIG_RD_LZMA=y # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set CONFIG_RD_LZ4=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_ANON_INODES=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: > On 08/08/13 00:08, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20130807: > > > > on i386 and x86_64: > when CONFIG_PCI_MSI is not enabled: > > There are many of these errors: > include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' > include/linux/msi.h:65:6: error: expected ')' before numeric constant > > because arch/x86/include/asm/pci.h defines: > #define default_teardown_msi_irqs NULL Do you have an example config you used? thx, Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? thx, Jason. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqsNULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks. -- ~Randy # # Automatically generated file; DO NOT EDIT. # Linux/x86_64 3.11.0-rc4 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT=elf64-x86-64 CONFIG_ARCH_DEFCONFIG=arch/x86/configs/x86_64_defconfig CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ZONE_DMA32=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_HWEIGHT_CFLAGS=-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11 CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST=/lib/modules/$UNAME_RELEASE/.config CONFIG_CONSTRUCTORS=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE= CONFIG_COMPILE_TEST=y CONFIG_LOCALVERSION= # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y # CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_BZIP2=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_HOSTNAME=(none) # CONFIG_SYSVIPC is not set # CONFIG_POSIX_MQUEUE is not set # CONFIG_FHANDLE is not set CONFIG_AUDIT=y # CONFIG_AUDITSYSCALL is not set CONFIG_AUDIT_LOGINUID_IMMUTABLE=y CONFIG_HAVE_GENERIC_HARDIRQS=y # # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y # # Timers subsystem # CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ_COMMON=y # CONFIG_HZ_PERIODIC is not set CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ=y # CONFIG_HIGH_RES_TIMERS is not set # # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_TASKSTATS=y # CONFIG_TASK_DELAY_ACCT is not set CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y # # RCU Subsystem # CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set CONFIG_RCU_STALL_COMMON=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y CONFIG_CGROUP_DEBUG=y # CONFIG_CGROUP_FREEZER is not set # CONFIG_CGROUP_DEVICE is not set CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set # CONFIG_CGROUP_CPUACCT is not set # CONFIG_RESOURCE_COUNTERS is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y # CONFIG_RT_GROUP_SCHED is not set # CONFIG_CHECKPOINT_RESTORE is not set # CONFIG_NAMESPACES is not set CONFIG_UIDGID_CONVERTED=y CONFIG_UIDGID_STRICT_TYPE_CHECKS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE= # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set CONFIG_RD_LZMA=y # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set CONFIG_RD_LZ4=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_ANON_INODES=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_PRINTK=y # CONFIG_BUG is not set CONFIG_ELF_CORE=y
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } #endif #define PCI_DMA_BUS_IS_PHYS (dma_ops-is_phys) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On 08/09/13 11:50, Jason Cooper wrote: Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. Works for me -- tested with PCI_MSI enabled disabled. Thanks. Acked-by: Randy Dunlap rdun...@infradead.org thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqsNULL #define native_teardown_msi_irq NULL -#define default_teardown_msi_irqsNULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } #endif #define PCI_DMA_BUS_IS_PHYS (dma_ops-is_phys) -- -- ~Randy -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: > On 08/08/13 00:08, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20130807: > > > > on i386 and x86_64: > when CONFIG_PCI_MSI is not enabled: > > There are many of these errors: > include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' > include/linux/msi.h:65:6: error: expected ')' before numeric constant > > because arch/x86/include/asm/pci.h defines: > #define default_teardown_msi_irqs NULL Grrr. That's us (mvebu tree) I've forwarded this to Thomas, the author of the patch. Hopefully we'll have this worked out soon. Thanks for testing, Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On 08/08/13 00:08, Stephen Rothwell wrote: > Hi all, > > Changes since 20130807: > on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL -- ~Randy -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Grrr. That's us (mvebu tree) I've forwarded this to Thomas, the author of the patch. Hopefully we'll have this worked out soon. Thanks for testing, Jason. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/