| Message ID | 20190916204158.6889-3-efremov@linux.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [RESEND,v3,01/26] PCI: Add define for the number of standard PCI BARs | expand |
> -----Original Message----- > From: Denis Efremov <efremov@linux.com> > Sent: Monday, September 16, 2019 4:42 PM > To: Bjorn Helgaas <bhelgaas@google.com> > Cc: Denis Efremov <efremov@linux.com>; linux-kernel@vger.kernel.org; > linux-pci@vger.kernel.org; Andrew Murray <andrew.murray@arm.com>; > linux-hyperv@vger.kernel.org; KY Srinivasan <kys@microsoft.com>; Haiyang > Zhang <haiyangz@microsoft.com>; Stephen Hemminger > <sthemmin@microsoft.com>; Sasha Levin <sashal@kernel.org> > Subject: [PATCH v3 02/26] PCI: hv: Use PCI_STD_NUM_BARS > > Replace the magic constant (6) with define PCI_STD_NUM_BARS > representing the number of PCI BARs. > > Cc: "K. Y. Srinivasan" <kys@microsoft.com> > Cc: Haiyang Zhang <haiyangz@microsoft.com> > Cc: Stephen Hemminger <sthemmin@microsoft.com> > Cc: Sasha Levin <sashal@kernel.org> > Signed-off-by: Denis Efremov <efremov@linux.com> > --- > drivers/pci/controller/pci-hyperv.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci- > hyperv.c > index 40b625458afa..1665c23b649f 100644 > --- a/drivers/pci/controller/pci-hyperv.c > +++ b/drivers/pci/controller/pci-hyperv.c > @@ -307,7 +307,7 @@ struct pci_bus_relations { struct > pci_q_res_req_response { > struct vmpacket_descriptor hdr; > s32 status; /* negative values are failures */ > - u32 probed_bar[6]; > + u32 probed_bar[PCI_STD_NUM_BARS]; > } __packed; > > struct pci_set_power { > @@ -503,7 +503,7 @@ struct hv_pci_dev { > * What would be observed if one wrote 0xFFFFFFFF to a BAR and > then > * read it back, for each of the BAR offsets within config space. > */ > - u32 probed_bar[6]; > + u32 probed_bar[PCI_STD_NUM_BARS]; > }; > > struct hv_pci_compl { > @@ -1327,7 +1327,7 @@ static void survey_child_resources(struct > hv_pcibus_device *hbus) > * so it's sufficient to just add them up without tracking alignment. > */ > list_for_each_entry(hpdev, &hbus->children, list_entry) { > - for (i = 0; i < 6; i++) { > + for (i = 0; i < PCI_STD_NUM_BARS; i++) { > if (hpdev->probed_bar[i] & > PCI_BASE_ADDRESS_SPACE_IO) > dev_err(&hbus->hdev->device, > "There's an I/O BAR in this list!\n"); > @@ -1401,7 +1401,7 @@ static void prepopulate_bars(struct > hv_pcibus_device *hbus) > /* Pick addresses for the BARs. */ > do { > list_for_each_entry(hpdev, &hbus->children, list_entry) { > - for (i = 0; i < 6; i++) { > + for (i = 0; i < PCI_STD_NUM_BARS; i++) { > bar_val = hpdev->probed_bar[i]; > if (bar_val == 0) > continue; > @@ -1558,7 +1558,7 @@ static void q_resource_requirements(void > *context, struct pci_response *resp, > "query resource requirements failed: %x\n", > resp->status); > } else { > - for (i = 0; i < 6; i++) { > + for (i = 0; i < PCI_STD_NUM_BARS; i++) { > completion->hpdev->probed_bar[i] = > q_res_req->probed_bar[i]; > } Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com> Thanks.
On Mon, Sep 16, 2019 at 11:41:34PM +0300, Denis Efremov wrote: > Replace the magic constant (6) with define PCI_STD_NUM_BARS representing > the number of PCI BARs. For some reason patches 0 and 1 didn't make it to the list. Can you resend them?
On Thu, Sep 26, 2019 at 05:05:31PM -0500, Bjorn Helgaas wrote: > On Mon, Sep 16, 2019 at 11:41:34PM +0300, Denis Efremov wrote: > > Replace the magic constant (6) with define PCI_STD_NUM_BARS representing > > the number of PCI BARs. > > For some reason patches 0 and 1 didn't make it to the list. Can you > resend them? (No need to resend the whole series, which might annoy all the other maintainers. Just send 0 (the cover letter) and 1 (which I assume adds the PCI_STD_NUM_BARS definition)).
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index 40b625458afa..1665c23b649f 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -307,7 +307,7 @@ struct pci_bus_relations { struct pci_q_res_req_response { struct vmpacket_descriptor hdr; s32 status; /* negative values are failures */ - u32 probed_bar[6]; + u32 probed_bar[PCI_STD_NUM_BARS]; } __packed; struct pci_set_power { @@ -503,7 +503,7 @@ struct hv_pci_dev { * What would be observed if one wrote 0xFFFFFFFF to a BAR and then * read it back, for each of the BAR offsets within config space. */ - u32 probed_bar[6]; + u32 probed_bar[PCI_STD_NUM_BARS]; }; struct hv_pci_compl { @@ -1327,7 +1327,7 @@ static void survey_child_resources(struct hv_pcibus_device *hbus) * so it's sufficient to just add them up without tracking alignment. */ list_for_each_entry(hpdev, &hbus->children, list_entry) { - for (i = 0; i < 6; i++) { + for (i = 0; i < PCI_STD_NUM_BARS; i++) { if (hpdev->probed_bar[i] & PCI_BASE_ADDRESS_SPACE_IO) dev_err(&hbus->hdev->device, "There's an I/O BAR in this list!\n"); @@ -1401,7 +1401,7 @@ static void prepopulate_bars(struct hv_pcibus_device *hbus) /* Pick addresses for the BARs. */ do { list_for_each_entry(hpdev, &hbus->children, list_entry) { - for (i = 0; i < 6; i++) { + for (i = 0; i < PCI_STD_NUM_BARS; i++) { bar_val = hpdev->probed_bar[i]; if (bar_val == 0) continue; @@ -1558,7 +1558,7 @@ static void q_resource_requirements(void *context, struct pci_response *resp, "query resource requirements failed: %x\n", resp->status); } else { - for (i = 0; i < 6; i++) { + for (i = 0; i < PCI_STD_NUM_BARS; i++) { completion->hpdev->probed_bar[i] = q_res_req->probed_bar[i]; }
Replace the magic constant (6) with define PCI_STD_NUM_BARS representing the number of PCI BARs. Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Stephen Hemminger <sthemmin@microsoft.com> Cc: Sasha Levin <sashal@kernel.org> Signed-off-by: Denis Efremov <efremov@linux.com> --- drivers/pci/controller/pci-hyperv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)