Skip to main content

Browse the archive

Revision 59247eaea50cc68cc6ce3d3fd3855f3301b65c96 authored by Jens Axboe on 06 March 2009, 07:55:24 UTC, committed by Jens Axboe on 06 March 2009, 07:55:24 UTC 
block: fix missing bio back/front segment size setting in blk_recount_segments()
 
Commit 1e42807918d17e8c93bf14fbb74be84b141334c1 introduced a bug where we
don't get front/back segment sizes in the bio in blk_recount_segments().
Fix this by tracking the back bio as well as the front bio in
__blk_recalc_rq_segments(), this also cleans up the interface by getting
rid of the segment size pointer passing.

Tested-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
1 parent a3941ec
Raw File
xenpack.h 
/****************************************************************************
 * Driver for Solarflare Solarstorm network controllers and boards
 * Copyright 2006 Solarflare Communications Inc.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 as published
 * by the Free Software Foundation, incorporated herein by reference.
 */

#ifndef EFX_XENPACK_H
#define EFX_XENPACK_H

/* Exported functions from Xenpack standard PHY control */

#include "mdio_10g.h"

/****************************************************************************/
/* XENPACK MDIO register extensions */
#define MDIO_XP_LASI_RX_CTRL	(0x9000)
#define MDIO_XP_LASI_TX_CTRL	(0x9001)
#define MDIO_XP_LASI_CTRL	(0x9002)
#define MDIO_XP_LASI_RX_STAT	(0x9003)
#define MDIO_XP_LASI_TX_STAT	(0x9004)
#define MDIO_XP_LASI_STAT	(0x9005)

/* Control/Status bits */
#define XP_LASI_LS_ALARM	(1 << 0)
#define XP_LASI_TX_ALARM	(1 << 1)
#define XP_LASI_RX_ALARM	(1 << 2)
/* These two are Quake vendor extensions to the standard XENPACK defines */
#define XP_LASI_LS_INTB		(1 << 3)
#define XP_LASI_TEST		(1 << 7)

/* Enable LASI interrupts for PHY */
static inline void xenpack_enable_lasi_irqs(struct efx_nic *efx)
{
	int reg;
	int phy_id = efx->mii.phy_id;
	/* Read to clear LASI status register */
	reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_PMAPMD,
				 MDIO_XP_LASI_STAT);

	mdio_clause45_write(efx, phy_id, MDIO_MMD_PMAPMD,
			    MDIO_XP_LASI_CTRL, XP_LASI_LS_ALARM);
}

/* Read the LASI interrupt status to clear the interrupt. */
static inline int xenpack_clear_lasi_irqs(struct efx_nic *efx)
{
	/* Read to clear link status alarm */
	return mdio_clause45_read(efx, efx->mii.phy_id,
				  MDIO_MMD_PMAPMD, MDIO_XP_LASI_STAT);
}

/* Turn off LASI interrupts */
static inline void xenpack_disable_lasi_irqs(struct efx_nic *efx)
{
	mdio_clause45_write(efx, efx->mii.phy_id, MDIO_MMD_PMAPMD,
			    MDIO_XP_LASI_CTRL, 0);
}

#endif /* EFX_XENPACK_H */
back to top