linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] PCI: endpoint: Allocate enough space for fixed size BAR
@ 2019-05-23 21:47 Alan Mikhak
  2019-05-23 23:56 ` Alan Mikhak
  2019-06-11 10:08 ` Lorenzo Pieralisi
  0 siblings, 2 replies; 4+ messages in thread
From: Alan Mikhak @ 2019-05-23 21:47 UTC (permalink / raw)
  To: linux-pci, linux-kernel, kishon, lorenzo.pieralisi, linux-riscv,
	palmer, paul.walmsley
  Cc: Alan Mikhak

PCI endpoint test function code should honor the .bar_fixed_size parameter
from underlying endpoint controller drivers or results may be unexpected.

In pci_epf_test_alloc_space(), check if BAR being used for test register
space is a fixed size BAR. If so, allocate the required fixed size.

Signed-off-by: Alan Mikhak <alan.mikhak@sifive.com>
---
 drivers/pci/endpoint/functions/pci-epf-test.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index 27806987e93b..7d41e6684b87 100644
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -434,10 +434,16 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
 	int bar;
 	enum pci_barno test_reg_bar = epf_test->test_reg_bar;
 	const struct pci_epc_features *epc_features;
+	size_t test_reg_size;
 
 	epc_features = epf_test->epc_features;
 
-	base = pci_epf_alloc_space(epf, sizeof(struct pci_epf_test_reg),
+	if (epc_features->bar_fixed_size[test_reg_bar])
+		test_reg_size = bar_size[test_reg_bar];
+	else
+		test_reg_size = sizeof(struct pci_epf_test_reg);
+
+	base = pci_epf_alloc_space(epf, test_reg_size,
 				   test_reg_bar, epc_features->align);
 	if (!base) {
 		dev_err(dev, "Failed to allocated register space\n");
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] PCI: endpoint: Allocate enough space for fixed size BAR
  2019-05-23 21:47 [PATCH v2] PCI: endpoint: Allocate enough space for fixed size BAR Alan Mikhak
@ 2019-05-23 23:56 ` Alan Mikhak
  2019-05-24  8:44   ` Kishon Vijay Abraham I
  2019-06-11 10:08 ` Lorenzo Pieralisi
  1 sibling, 1 reply; 4+ messages in thread
From: Alan Mikhak @ 2019-05-23 23:56 UTC (permalink / raw)
  To: linux-pci, linux-kernel, kishon, lorenzo.pieralisi, linux-riscv,
	Palmer Dabbelt, Paul Walmsley, Bjorn Helgaas, gustavo.pimentel,
	wen.yang99, kjlu

+Bjorn Helgaas, +Gustavo Pimentel, +Wen Yang, +Kangjie Lu

On Thu, May 23, 2019 at 2:48 PM Alan Mikhak <alan.mikhak@sifive.com> wrote:
>
> PCI endpoint test function code should honor the .bar_fixed_size parameter
> from underlying endpoint controller drivers or results may be unexpected.
>
> In pci_epf_test_alloc_space(), check if BAR being used for test register
> space is a fixed size BAR. If so, allocate the required fixed size.
>
> Signed-off-by: Alan Mikhak <alan.mikhak@sifive.com>
> ---
>  drivers/pci/endpoint/functions/pci-epf-test.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
> index 27806987e93b..7d41e6684b87 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-test.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
> @@ -434,10 +434,16 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
>         int bar;
>         enum pci_barno test_reg_bar = epf_test->test_reg_bar;
>         const struct pci_epc_features *epc_features;
> +       size_t test_reg_size;
>
>         epc_features = epf_test->epc_features;
>
> -       base = pci_epf_alloc_space(epf, sizeof(struct pci_epf_test_reg),
> +       if (epc_features->bar_fixed_size[test_reg_bar])
> +               test_reg_size = bar_size[test_reg_bar];
> +       else
> +               test_reg_size = sizeof(struct pci_epf_test_reg);
> +
> +       base = pci_epf_alloc_space(epf, test_reg_size,
>                                    test_reg_bar, epc_features->align);
>         if (!base) {
>                 dev_err(dev, "Failed to allocated register space\n");
> --
> 2.7.4
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] PCI: endpoint: Allocate enough space for fixed size BAR
  2019-05-23 23:56 ` Alan Mikhak
@ 2019-05-24  8:44   ` Kishon Vijay Abraham I
  0 siblings, 0 replies; 4+ messages in thread
From: Kishon Vijay Abraham I @ 2019-05-24  8:44 UTC (permalink / raw)
  To: Alan Mikhak, linux-pci, linux-kernel, lorenzo.pieralisi,
	linux-riscv, Palmer Dabbelt, Paul Walmsley, Bjorn Helgaas,
	gustavo.pimentel, wen.yang99, kjlu



On 24/05/19 5:26 AM, Alan Mikhak wrote:
> +Bjorn Helgaas, +Gustavo Pimentel, +Wen Yang, +Kangjie Lu
> 
> On Thu, May 23, 2019 at 2:48 PM Alan Mikhak <alan.mikhak@sifive.com> wrote:
>>
>> PCI endpoint test function code should honor the .bar_fixed_size parameter
>> from underlying endpoint controller drivers or results may be unexpected.
>>
>> In pci_epf_test_alloc_space(), check if BAR being used for test register
>> space is a fixed size BAR. If so, allocate the required fixed size.
>>
>> Signed-off-by: Alan Mikhak <alan.mikhak@sifive.com>

Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
>> ---
>>  drivers/pci/endpoint/functions/pci-epf-test.c | 8 +++++++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
>> index 27806987e93b..7d41e6684b87 100644
>> --- a/drivers/pci/endpoint/functions/pci-epf-test.c
>> +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
>> @@ -434,10 +434,16 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
>>         int bar;
>>         enum pci_barno test_reg_bar = epf_test->test_reg_bar;
>>         const struct pci_epc_features *epc_features;
>> +       size_t test_reg_size;
>>
>>         epc_features = epf_test->epc_features;
>>
>> -       base = pci_epf_alloc_space(epf, sizeof(struct pci_epf_test_reg),
>> +       if (epc_features->bar_fixed_size[test_reg_bar])
>> +               test_reg_size = bar_size[test_reg_bar];
>> +       else
>> +               test_reg_size = sizeof(struct pci_epf_test_reg);
>> +
>> +       base = pci_epf_alloc_space(epf, test_reg_size,
>>                                    test_reg_bar, epc_features->align);
>>         if (!base) {
>>                 dev_err(dev, "Failed to allocated register space\n");
>> --
>> 2.7.4
>>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] PCI: endpoint: Allocate enough space for fixed size BAR
  2019-05-23 21:47 [PATCH v2] PCI: endpoint: Allocate enough space for fixed size BAR Alan Mikhak
  2019-05-23 23:56 ` Alan Mikhak
@ 2019-06-11 10:08 ` Lorenzo Pieralisi
  1 sibling, 0 replies; 4+ messages in thread
From: Lorenzo Pieralisi @ 2019-06-11 10:08 UTC (permalink / raw)
  To: Alan Mikhak
  Cc: linux-pci, linux-kernel, kishon, linux-riscv, palmer, paul.walmsley

On Thu, May 23, 2019 at 02:47:59PM -0700, Alan Mikhak wrote:
> PCI endpoint test function code should honor the .bar_fixed_size parameter
> from underlying endpoint controller drivers or results may be unexpected.
> 
> In pci_epf_test_alloc_space(), check if BAR being used for test register
> space is a fixed size BAR. If so, allocate the required fixed size.
> 
> Signed-off-by: Alan Mikhak <alan.mikhak@sifive.com>
> ---
>  drivers/pci/endpoint/functions/pci-epf-test.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

Applied to pci/endpoint for v5.3, thanks.

Lorenzo

> diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
> index 27806987e93b..7d41e6684b87 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-test.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
> @@ -434,10 +434,16 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
>  	int bar;
>  	enum pci_barno test_reg_bar = epf_test->test_reg_bar;
>  	const struct pci_epc_features *epc_features;
> +	size_t test_reg_size;
>  
>  	epc_features = epf_test->epc_features;
>  
> -	base = pci_epf_alloc_space(epf, sizeof(struct pci_epf_test_reg),
> +	if (epc_features->bar_fixed_size[test_reg_bar])
> +		test_reg_size = bar_size[test_reg_bar];
> +	else
> +		test_reg_size = sizeof(struct pci_epf_test_reg);
> +
> +	base = pci_epf_alloc_space(epf, test_reg_size,
>  				   test_reg_bar, epc_features->align);
>  	if (!base) {
>  		dev_err(dev, "Failed to allocated register space\n");
> -- 
> 2.7.4
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-06-11 10:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-23 21:47 [PATCH v2] PCI: endpoint: Allocate enough space for fixed size BAR Alan Mikhak
2019-05-23 23:56 ` Alan Mikhak
2019-05-24  8:44   ` Kishon Vijay Abraham I
2019-06-11 10:08 ` Lorenzo Pieralisi

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).