* [trivial PATCH resend 0/2] @ 2012-07-20 7:02 Jon Mason 2012-07-20 7:02 ` [trivial PATCH resend 1/2] ixgb: use PCI_VENDOR_ID_INTEL Jon Mason 2012-07-20 7:02 ` [trivial PATCH resend 2/2] ixgbe: " Jon Mason 0 siblings, 2 replies; 8+ messages in thread From: Jon Mason @ 2012-07-20 7:02 UTC (permalink / raw) To: trivial; +Cc: netdev, linux-kernel Resending original patch #1 and sending a revised patch #2 to netdev per Jeff Kirsher's request. The rest of the original series of 7 is not being resent. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [trivial PATCH resend 1/2] ixgb: use PCI_VENDOR_ID_INTEL 2012-07-20 7:02 [trivial PATCH resend 0/2] Jon Mason @ 2012-07-20 7:02 ` Jon Mason 2012-07-20 7:11 ` Jeff Kirsher 2012-07-20 7:02 ` [trivial PATCH resend 2/2] ixgbe: " Jon Mason 1 sibling, 1 reply; 8+ messages in thread From: Jon Mason @ 2012-07-20 7:02 UTC (permalink / raw) To: trivial Cc: netdev, linux-kernel, Jeff Kirsher, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny, Don Skidmore, Greg Rose, Peter P Waskiewicz Jr, Alex Duyck, John Ronciak Use PCI_VENDOR_ID_INTEL from pci_ids.h instead of creating its own vendor ID #define. Signed-off-by: Jon Mason <jdmason@kudzu.us> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Bruce Allan <bruce.w.allan@intel.com> Cc: Carolyn Wyborny <carolyn.wyborny@intel.com> Cc: Don Skidmore <donald.c.skidmore@intel.com> Cc: Greg Rose <gregory.v.rose@intel.com> Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Cc: Alex Duyck <alexander.h.duyck@intel.com> Cc: John Ronciak <john.ronciak@intel.com> --- drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 5 +++-- drivers/net/ethernet/intel/ixgb/ixgb_ids.h | 5 ----- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 10 +++++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c index 99b69ad..bf9a220 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c @@ -32,6 +32,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/pci_ids.h> #include "ixgb_hw.h" #include "ixgb_ids.h" @@ -96,7 +97,7 @@ static u32 ixgb_mac_reset(struct ixgb_hw *hw) ASSERT(!(ctrl_reg & IXGB_CTRL0_RST)); #endif - if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) { + if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN) { ctrl_reg = /* Enable interrupt from XFP and SerDes */ IXGB_CTRL1_GPI0_EN | IXGB_CTRL1_SDP6_DIR | @@ -271,7 +272,7 @@ ixgb_identify_phy(struct ixgb_hw *hw) } /* update phy type for sun specific board */ - if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) + if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN) phy_type = ixgb_phy_type_bcm; return phy_type; diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ids.h b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h index 2a58847..32c1b30 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_ids.h +++ b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h @@ -33,11 +33,6 @@ ** The Device and Vendor IDs for 10 Gigabit MACs **********************************************************************/ -#define INTEL_VENDOR_ID 0x8086 -#define INTEL_SUBVENDOR_ID 0x8086 -#define SUN_VENDOR_ID 0x108E -#define SUN_SUBVENDOR_ID 0x108E - #define IXGB_DEVICE_ID_82597EX 0x1048 #define IXGB_DEVICE_ID_82597EX_SR 0x1A48 #define IXGB_DEVICE_ID_82597EX_LR 0x1B48 diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index 5fce363..4e5a060 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c @@ -54,13 +54,13 @@ MODULE_PARM_DESC(copybreak, * Class, Class Mask, private data (not used) } */ static DEFINE_PCI_DEVICE_TABLE(ixgb_pci_tbl) = { - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX, + {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4, + {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_CX4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, + {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_SR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR, + {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_LR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* required last entry */ @@ -195,7 +195,7 @@ ixgb_irq_enable(struct ixgb_adapter *adapter) { u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 | IXGB_INT_TXDW | IXGB_INT_LSC; - if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID) + if (adapter->hw.subsystem_vendor_id == PCI_VENDOR_ID_SUN) val |= IXGB_INT_GPI0; IXGB_WRITE_REG(&adapter->hw, IMS, val); IXGB_WRITE_FLUSH(&adapter->hw); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [trivial PATCH resend 1/2] ixgb: use PCI_VENDOR_ID_INTEL 2012-07-20 7:02 ` [trivial PATCH resend 1/2] ixgb: use PCI_VENDOR_ID_INTEL Jon Mason @ 2012-07-20 7:11 ` Jeff Kirsher 2012-07-20 18:00 ` David Miller 0 siblings, 1 reply; 8+ messages in thread From: Jeff Kirsher @ 2012-07-20 7:11 UTC (permalink / raw) To: Jon Mason Cc: trivial, netdev, linux-kernel, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny, Don Skidmore, Greg Rose, Peter P Waskiewicz Jr, Alex Duyck, John Ronciak [-- Attachment #1: Type: text/plain, Size: 1121 bytes --] On Fri, 2012-07-20 at 00:02 -0700, Jon Mason wrote: > Use PCI_VENDOR_ID_INTEL from pci_ids.h instead of creating its own > vendor ID #define. > > Signed-off-by: Jon Mason <jdmason@kudzu.us> > Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> > Cc: Bruce Allan <bruce.w.allan@intel.com> > Cc: Carolyn Wyborny <carolyn.wyborny@intel.com> > Cc: Don Skidmore <donald.c.skidmore@intel.com> > Cc: Greg Rose <gregory.v.rose@intel.com> > Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > Cc: Alex Duyck <alexander.h.duyck@intel.com> > Cc: John Ronciak <john.ronciak@intel.com> > --- > drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 5 +++-- > drivers/net/ethernet/intel/ixgb/ixgb_ids.h | 5 ----- > drivers/net/ethernet/intel/ixgb/ixgb_main.c | 10 +++++----- > 3 files changed, 8 insertions(+), 12 deletions(-) Like I said before, I do not consider this patch "trivial" so it is interesting that you submitted again as a trivial patch. At least you CC'd netdev like I asked. Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [trivial PATCH resend 1/2] ixgb: use PCI_VENDOR_ID_INTEL 2012-07-20 7:11 ` Jeff Kirsher @ 2012-07-20 18:00 ` David Miller 0 siblings, 0 replies; 8+ messages in thread From: David Miller @ 2012-07-20 18:00 UTC (permalink / raw) To: jeffrey.t.kirsher Cc: jdmason, trivial, netdev, linux-kernel, jesse.brandeburg, bruce.w.allan, carolyn.wyborny, donald.c.skidmore, gregory.v.rose, peter.p.waskiewicz.jr, alexander.h.duyck, john.ronciak From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Fri, 20 Jul 2012 00:11:17 -0700 > On Fri, 2012-07-20 at 00:02 -0700, Jon Mason wrote: >> Use PCI_VENDOR_ID_INTEL from pci_ids.h instead of creating its own >> vendor ID #define. >> >> Signed-off-by: Jon Mason <jdmason@kudzu.us> ... > Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Applied. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [trivial PATCH resend 2/2] ixgbe: use PCI_VENDOR_ID_INTEL 2012-07-20 7:02 [trivial PATCH resend 0/2] Jon Mason 2012-07-20 7:02 ` [trivial PATCH resend 1/2] ixgb: use PCI_VENDOR_ID_INTEL Jon Mason @ 2012-07-20 7:02 ` Jon Mason 2012-07-20 7:14 ` Jeff Kirsher 2012-07-20 7:17 ` Jeff Kirsher 1 sibling, 2 replies; 8+ messages in thread From: Jon Mason @ 2012-07-20 7:02 UTC (permalink / raw) To: trivial Cc: netdev, linux-kernel, Jeff Kirsher, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny, Don Skidmore, Greg Rose, Peter P Waskiewicz Jr, Alex Duyck, John Ronciak Use PCI_VENDOR_ID_INTEL from pci_ids.h instead of creating its own vendor ID #define. Signed-off-by: Jon Mason <jdmason@kudzu.us> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Bruce Allan <bruce.w.allan@intel.com> Cc: Carolyn Wyborny <carolyn.wyborny@intel.com> Cc: Don Skidmore <donald.c.skidmore@intel.com> Cc: Greg Rose <gregory.v.rose@intel.com> Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Cc: Alex Duyck <alexander.h.duyck@intel.com> Cc: John Ronciak <john.ronciak@intel.com> --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 8 ++++---- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 18ca3bc..8a3fafb 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -7516,11 +7516,11 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev, } /* Find the pci device of the offending VF */ - vfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL); + vfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, NULL); while (vfdev) { if (vfdev->devfn == (req_id & 0xFF)) break; - vfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, + vfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, vfdev); } /* diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index 2d971d1..28018d4 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -65,13 +65,13 @@ static int ixgbe_find_enabled_vfs(struct ixgbe_adapter *adapter) } vf_devfn = pdev->devfn + 0x80; - pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL); + pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, NULL); while (pvfdev) { if (pvfdev->devfn == vf_devfn && (pvfdev->bus->number >= pdev->bus->number)) vfs_found++; vf_devfn += 2; - pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, + pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, pvfdev); } @@ -488,11 +488,11 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask) break; } - pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL); + pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, NULL); while (pvfdev) { if (pvfdev->devfn == thisvf_devfn) break; - pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, + pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, pvfdev); } if (pvfdev) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index 204848d..c8d8040 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h @@ -32,9 +32,6 @@ #include <linux/mdio.h> #include <linux/netdevice.h> -/* Vendor ID */ -#define IXGBE_INTEL_VENDOR_ID 0x8086 - /* Device IDs */ #define IXGBE_DEV_ID_82598 0x10B6 #define IXGBE_DEV_ID_82598_BX 0x1508 -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [trivial PATCH resend 2/2] ixgbe: use PCI_VENDOR_ID_INTEL 2012-07-20 7:02 ` [trivial PATCH resend 2/2] ixgbe: " Jon Mason @ 2012-07-20 7:14 ` Jeff Kirsher 2012-07-20 7:17 ` Jeff Kirsher 1 sibling, 0 replies; 8+ messages in thread From: Jeff Kirsher @ 2012-07-20 7:14 UTC (permalink / raw) To: Jon Mason Cc: trivial, netdev, linux-kernel, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny, Don Skidmore, Greg Rose, Peter P Waskiewicz Jr, Alex Duyck, John Ronciak [-- Attachment #1: Type: text/plain, Size: 1251 bytes --] On Fri, 2012-07-20 at 00:02 -0700, Jon Mason wrote: > Use PCI_VENDOR_ID_INTEL from pci_ids.h instead of creating its own > vendor ID #define. > > Signed-off-by: Jon Mason <jdmason@kudzu.us> > Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> > Cc: Bruce Allan <bruce.w.allan@intel.com> > Cc: Carolyn Wyborny <carolyn.wyborny@intel.com> > Cc: Don Skidmore <donald.c.skidmore@intel.com> > Cc: Greg Rose <gregory.v.rose@intel.com> > Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > Cc: Alex Duyck <alexander.h.duyck@intel.com> > Cc: John Ronciak <john.ronciak@intel.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- > drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 8 ++++---- > drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 --- > 3 files changed, 6 insertions(+), 9 deletions(-) Same goes for this patch as well (not being trivial). I already have several patches submitted for Dave against ixgbe currently and I am not sure if there would be any issues with this patch applying on top of the currently submitted patches. I will verify this applies cleanly with no issue to my current net-next tree before I send my ACK. [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [trivial PATCH resend 2/2] ixgbe: use PCI_VENDOR_ID_INTEL 2012-07-20 7:02 ` [trivial PATCH resend 2/2] ixgbe: " Jon Mason 2012-07-20 7:14 ` Jeff Kirsher @ 2012-07-20 7:17 ` Jeff Kirsher 2012-07-20 18:00 ` David Miller 1 sibling, 1 reply; 8+ messages in thread From: Jeff Kirsher @ 2012-07-20 7:17 UTC (permalink / raw) To: Jon Mason Cc: trivial, netdev, linux-kernel, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny, Don Skidmore, Greg Rose, Peter P Waskiewicz Jr, Alex Duyck, John Ronciak [-- Attachment #1: Type: text/plain, Size: 1027 bytes --] On Fri, 2012-07-20 at 00:02 -0700, Jon Mason wrote: > Use PCI_VENDOR_ID_INTEL from pci_ids.h instead of creating its own > vendor ID #define. > > Signed-off-by: Jon Mason <jdmason@kudzu.us> > Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> > Cc: Bruce Allan <bruce.w.allan@intel.com> > Cc: Carolyn Wyborny <carolyn.wyborny@intel.com> > Cc: Don Skidmore <donald.c.skidmore@intel.com> > Cc: Greg Rose <gregory.v.rose@intel.com> > Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > Cc: Alex Duyck <alexander.h.duyck@intel.com> > Cc: John Ronciak <john.ronciak@intel.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- > drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 8 ++++---- > drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 --- > 3 files changed, 6 insertions(+), 9 deletions(-) This applies cleanly against my current net-next tree and looks fine. Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [trivial PATCH resend 2/2] ixgbe: use PCI_VENDOR_ID_INTEL 2012-07-20 7:17 ` Jeff Kirsher @ 2012-07-20 18:00 ` David Miller 0 siblings, 0 replies; 8+ messages in thread From: David Miller @ 2012-07-20 18:00 UTC (permalink / raw) To: jeffrey.t.kirsher Cc: jdmason, trivial, netdev, linux-kernel, jesse.brandeburg, bruce.w.allan, carolyn.wyborny, donald.c.skidmore, gregory.v.rose, peter.p.waskiewicz.jr, alexander.h.duyck, john.ronciak From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Fri, 20 Jul 2012 00:17:09 -0700 > On Fri, 2012-07-20 at 00:02 -0700, Jon Mason wrote: >> Use PCI_VENDOR_ID_INTEL from pci_ids.h instead of creating its own >> vendor ID #define. >> >> Signed-off-by: Jon Mason <jdmason@kudzu.us> ... > Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Applied. ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-07-20 18:00 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-07-20 7:02 [trivial PATCH resend 0/2] Jon Mason 2012-07-20 7:02 ` [trivial PATCH resend 1/2] ixgb: use PCI_VENDOR_ID_INTEL Jon Mason 2012-07-20 7:11 ` Jeff Kirsher 2012-07-20 18:00 ` David Miller 2012-07-20 7:02 ` [trivial PATCH resend 2/2] ixgbe: " Jon Mason 2012-07-20 7:14 ` Jeff Kirsher 2012-07-20 7:17 ` Jeff Kirsher 2012-07-20 18:00 ` David Miller
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).