diff mbox

PCI: altera: fix loop in tlp_read_packet()

Message ID 20151104133936.GI20966@mwanda (mailing list archive)
State New, archived
Delegated to: Bjorn Helgaas
Headers show

Commit Message

Dan Carpenter Nov. 4, 2015, 1:39 p.m. UTC
The problem is that TLP_LOOP is 500 and the "loop" variable was a u8 so
"loop < TLP_LOOP" is always true.  We only need this condition to work
if there is a problem so it would have been easy to miss this in
testing.  Anyway, lets just make it a normal for loop with "int i"
instead of over thinking things and making it complicated.

Fixes: 6bb4dd154ae8 ('PCI: altera: Add Altera PCIe host controller driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Ley Foon Tan Nov. 5, 2015, 1:56 a.m. UTC | #1
On Wed, Nov 4, 2015 at 9:39 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> The problem is that TLP_LOOP is 500 and the "loop" variable was a u8 so
> "loop < TLP_LOOP" is always true.  We only need this condition to work
> if there is a problem so it would have been easy to miss this in
> testing.  Anyway, lets just make it a normal for loop with "int i"
> instead of over thinking things and making it complicated.
>
> Fixes: 6bb4dd154ae8 ('PCI: altera: Add Altera PCIe host controller driver')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
Acked-by: Ley Foon Tan <lftan@altera.com>

Thanks for the fix.

Regards
Ley Foon
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas Nov. 25, 2015, 6:03 p.m. UTC | #2
On Wed, Nov 04, 2015 at 04:39:36PM +0300, Dan Carpenter wrote:
> The problem is that TLP_LOOP is 500 and the "loop" variable was a u8 so
> "loop < TLP_LOOP" is always true.  We only need this condition to work
> if there is a problem so it would have been easy to miss this in
> testing.  Anyway, lets just make it a normal for loop with "int i"
> instead of over thinking things and making it complicated.
> 
> Fixes: 6bb4dd154ae8 ('PCI: altera: Add Altera PCIe host controller driver')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied with Ley Foon's ack to pci/host-altera for v4.5, thanks!

> 
> diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c
> index e5dda38..b05de63 100644
> --- a/drivers/pci/host/pcie-altera.c
> +++ b/drivers/pci/host/pcie-altera.c
> @@ -166,16 +166,16 @@ static bool altera_pcie_valid_config(struct altera_pcie *pcie,
>  
>  static int tlp_read_packet(struct altera_pcie *pcie, u32 *value)
>  {
> -	u8 loop;
>  	bool sop = 0;
>  	u32 ctrl;
>  	u32 reg0, reg1;
> +	int i;
>  
>  	/*
>  	 * Minimum 2 loops to read TLP headers and 1 loop to read data
>  	 * payload.
>  	 */
> -	for (loop = 0; loop < TLP_LOOP; loop++) {
> +	for (i = 0; i < TLP_LOOP; i++) {
>  		ctrl = cra_readl(pcie, RP_RXCPL_STATUS);
>  		if ((ctrl & RP_RXCPL_SOP) || (ctrl & RP_RXCPL_EOP) || sop) {
>  			reg0 = cra_readl(pcie, RP_RXCPL_REG0);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c
index e5dda38..b05de63 100644
--- a/drivers/pci/host/pcie-altera.c
+++ b/drivers/pci/host/pcie-altera.c
@@ -166,16 +166,16 @@  static bool altera_pcie_valid_config(struct altera_pcie *pcie,
 
 static int tlp_read_packet(struct altera_pcie *pcie, u32 *value)
 {
-	u8 loop;
 	bool sop = 0;
 	u32 ctrl;
 	u32 reg0, reg1;
+	int i;
 
 	/*
 	 * Minimum 2 loops to read TLP headers and 1 loop to read data
 	 * payload.
 	 */
-	for (loop = 0; loop < TLP_LOOP; loop++) {
+	for (i = 0; i < TLP_LOOP; i++) {
 		ctrl = cra_readl(pcie, RP_RXCPL_STATUS);
 		if ((ctrl & RP_RXCPL_SOP) || (ctrl & RP_RXCPL_EOP) || sop) {
 			reg0 = cra_readl(pcie, RP_RXCPL_REG0);