mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Gabe Black <gabe.black@ni.com>
Cc: jbarnes@virtuousgeek.org, shawn.bohrer@ni.com,
	mike.hoogendyk@ni.com, linux-pci@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Populate subsystem vendor and device IDs for PCI-Bridges
Date: Tue, 13 Oct 2009 18:45:11 -0700	[thread overview]
Message-ID: <20091013184511.c9b67d06.akpm@linux-foundation.org> (raw)
In-Reply-To: <1254843919-13809-1-git-send-email-gabe.black@ni.com>

On Tue, 6 Oct 2009 10:45:19 -0500 Gabe Black <gabe.black@ni.com> wrote:

> Change to populate the subsystem vendor and subsytem device IDs for
> PCI-PCI bridges that implement the PCI Subsystem Vendor ID capability.
> Previously bridges left subsystem vendor IDs unpopulated.
> 
> Signed-off-by: Gabe Black <gabe.black@ni.com>
> ---
>  drivers/pci/probe.c      |    6 ++++++
>  include/linux/pci_regs.h |    5 +++++
>  2 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index 8105e32..6d90246 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -731,6 +731,7 @@ int pci_setup_device(struct pci_dev *dev)
>  	u32 class;
>  	u8 hdr_type;
>  	struct pci_slot *slot;
> +	int pos = 0;
>  
>  	if (pci_read_config_byte(dev, PCI_HEADER_TYPE, &hdr_type))
>  		return -EIO;
> @@ -822,6 +823,11 @@ int pci_setup_device(struct pci_dev *dev)
>  		dev->transparent = ((dev->class & 0xff) == 1);
>  		pci_read_bases(dev, 2, PCI_ROM_ADDRESS1);
>  		set_pcie_hotplug_bridge(dev);
> +		pos = pci_find_capability(dev, PCI_CAP_ID_SSVID);
> +		if (pos) {
> +			pci_read_config_word(dev, pos + PCI_SSVID_VENDOR_ID, &dev->subsystem_vendor);
> +			pci_read_config_word(dev, pos + PCI_SSVID_DEVICE_ID, &dev->subsystem_device);
> +		}
>  		break;
>  
>  	case PCI_HEADER_TYPE_CARDBUS:		    /* CardBus bridge header */
> diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
> index dd0bed4..d3b0cfb 100644
> --- a/include/linux/pci_regs.h
> +++ b/include/linux/pci_regs.h
> @@ -365,6 +365,11 @@
>  #define  PCI_X_STATUS_266MHZ	0x40000000	/* 266 MHz capable */
>  #define  PCI_X_STATUS_533MHZ	0x80000000	/* 533 MHz capable */
>  
> +/* PCI Bridge Subsystem ID registers */
> +
> +#define PCI_SSVID_VENDOR_ID     4	/* PCI-Bridge subsystem vendor id register */
> +#define PCI_SSVID_DEVICE_ID     6	/* PCI-Bridge subsystem device id register */
> +
>  /* PCI Express capability registers */
>  
>  #define PCI_EXP_FLAGS		2	/* Capabilities register */

What is the reason for making this change?

  reply	other threads:[~2009-10-14  1:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-06 15:45 Gabe Black
2009-10-14  1:45 ` Andrew Morton [this message]
2009-11-04 17:42 ` Jesse Barnes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091013184511.c9b67d06.akpm@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=gabe.black@ni.com \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=mike.hoogendyk@ni.com \
    --cc=shawn.bohrer@ni.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome